diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
commit | 64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch) | |
tree | 4303648095deff998ae20c2393b56db527742ac9 /backend/hp3500.c | |
parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/hp3500.c')
-rw-r--r-- | backend/hp3500.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/backend/hp3500.c b/backend/hp3500.c index fc2c6b5..b7a2d59 100644 --- a/backend/hp3500.c +++ b/backend/hp3500.c @@ -13,9 +13,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + along with this program. If not, see <https://www.gnu.org/licenses/>. As a special exception, the authors of SANE give permission for additional uses of the libraries contained in this release of SANE. @@ -332,7 +330,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) /** * Called to establish connection with the scanner. This function will - * also establish meaningful defauls and initialize the options. + * also establish meaningful defaults and initialize the options. * * From the SANE spec: * This function is used to establish a connection to a particular @@ -873,7 +871,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, * handle h is a valid handle) but usually affects long-running * operations only (such as image is acquisition). It is safe to call * this function asynchronously (e.g., from within a signal handler). - * It is important to note that completion of this operaton does not + * It is important to note that completion of this operation does not * imply that the currently pending operation has been cancelled. It * only guarantees that cancellation has been initiated. Cancellation * completes only when the cancelled call returns (typically with a @@ -1290,7 +1288,7 @@ rt_queue_command (int command, unsigned char *buffer; unsigned char const *data = data_; - /* We add "bytes" here to account for the possiblity that all of the + /* We add "bytes" here to account for the possibility that all of the * data bytes are 0xaa and hence require a following 0x00 byte. */ if (command_bytes_outstanding + len + bytes > MAX_COMMANDS_BYTES || |