diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
commit | ecaaf250cb33ff61f37a7b441f2337584a655350 (patch) | |
tree | 4303648095deff998ae20c2393b56db527742ac9 /include/sane/sanei_scsi.h | |
parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
parent | 351b7328520c16730ceb46e5acae16038c42185e (diff) |
Update upstream source from tag 'upstream/1.0.32'
Update to upstream version '1.0.32'
with Debian dir 2c1111c59d9d68bcbf479a4a4de7697fe2de127f
Diffstat (limited to 'include/sane/sanei_scsi.h')
-rw-r--r-- | include/sane/sanei_scsi.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/sane/sanei_scsi.h b/include/sane/sanei_scsi.h index fa6e5d1..d9e0f8a 100644 --- a/include/sane/sanei_scsi.h +++ b/include/sane/sanei_scsi.h @@ -13,8 +13,8 @@ License for more details. You should have received a copy of the GNU General Public License - along with sane; see the file COPYING. If not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with sane; see the file COPYING. + 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. @@ -113,7 +113,7 @@ extern void sanei_scsi_find_devices (const char *vendor, const char *model, * - SANE_STATUS_ACCESS_DENIED - if the file couldn't be accessed due to * permissions * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory) - * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occured + * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occurred * * @sa sanei_scsi_open_extended(), HAVE_SANEI_SCSI_OPEN_EXTENDED */ @@ -144,7 +144,7 @@ extern SANE_Status sanei_scsi_open (const char * device_name, int * fd, * - SANE_STATUS_ACCESS_DENIED - if the file couldn't be accessed due to * permissions * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory) - * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occured + * - SANE_STATUS_INVAL - if the filename was invalid or an unknown error occurred * * @sa sanei_scsi_open(), HAVE_SANEI_SCSI_OPEN_EXTENDED */ @@ -186,7 +186,7 @@ extern SANE_Status sanei_scsi_open_extended ( * - SANE_STATUS_GOOD - on success * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory) - * - SANE_STATUS_INVAL - if a locking or an unknown error occured + * - SANE_STATUS_INVAL - if a locking or an unknown error occurred * @sa sanei_scsi_req_enter2() * */ @@ -200,7 +200,7 @@ extern SANE_Status sanei_scsi_req_enter (int fd, * Same as sanei_scsi_req_enter(), but with separate buffers for the SCSI * command and for the data to be sent to the device. * - * With sanei_scsi_req_enter(), the length of te SCSI command block must be + * With sanei_scsi_req_enter(), the length of the SCSI command block must be * guessed. While that works in most cases, Canon scanners for example use the * vendor specific commands 0xd4, 0xd5 and 0xd6. The Canon scanners want to * get 6 byte command blocks for these commands, but sanei_scsi_req_enter() and @@ -224,7 +224,7 @@ extern SANE_Status sanei_scsi_req_enter (int fd, * - SANE_STATUS_GOOD - on success * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory) - * - SANE_STATUS_INVAL - if a locking or an unknown error occured + * - SANE_STATUS_INVAL - if a locking or an unknown error occurred * @sa sanei_scsi_req_enter() */ extern SANE_Status sanei_scsi_req_enter2 (int fd, @@ -264,7 +264,7 @@ extern SANE_Status sanei_scsi_req_wait (void *id); * - SANE_STATUS_GOOD - on success * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory) - * - SANE_STATUS_INVAL - if a locking or an unknown error occured + * - SANE_STATUS_INVAL - if a locking or an unknown error occurred * * @sa sanei_scsi_cmd2(), sanei_scsi_req_enter(), sanei_scsi_req_wait() */ @@ -291,7 +291,7 @@ extern SANE_Status sanei_scsi_cmd (int fd, * - SANE_STATUS_GOOD - on success * - SANE_STATUS_IO_ERROR - if an error was received from the SCSI driver * - SANE_STATUS_NO_MEM - if malloc failed (not enough memory) - * - SANE_STATUS_INVAL - if a locking or an unknown error occured + * - SANE_STATUS_INVAL - if a locking or an unknown error occurred * * @sa sanei_scsi_cmd(), sanei_scsi_req_enter(), sanei_scsi_req_wait() */ |