spelling fixes for sane core

2020-08-29 08:47:52 +02:00 · 2020-08-29 08:47:52 +02:00 · 2ad63d4e1e
commit 2ad63d4e1e
--- a/Makefile.am
+++ b/Makefile.am
@ -51,7 +51,7 @@ EXTRA_DIST += po/README
 #
 # Keep the .gitignore files sorted, and use this target to do it.
 # Note that git's negated ignore patterns introduce order dependency
-# and should therefor be sorted with much more care than we do here.
+# and should therefore be sorted with much more care than we do here.
 # Until that has been taken care of, such files are best left alone.
 #
 PERL=perl
@ -91,12 +91,12 @@ libcheck:
 	fi

 # Verify that backends do not contain any unwanted public symbols
-# anytime check or distcheck is ran.
+# anytime check or distcheck is run.
 # TODO: Currently this doesn't pass.  Uncomment once symbols have
 # been cleaned up.
 #check-am: libcheck

-# Run testsuite any time installcheck or distcheck is ran.
+# Run testsuite any time installcheck or distcheck is run.
 # Must run testsuite after install or else shared library backends
 # will not be found (including test backend).
 installcheck-local:
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@ -185,7 +185,7 @@ be_convenience_libs = libabaton.la libagfafocus.la \
    libumax1220u.la libumax_pp.la libv4l.la \
    libxerox_mfp.la

-# Each stand alone backend thats possible to be built should be listed
+# Each stand-alone backend that's possible to be built should be listed
 # here.  There are the libraries that are installed under $(libdir)/sane.
 # Format is libsane-${backend}.la.
 be_dlopen_libs = libsane-abaton.la libsane-agfafocus.la \
@ -232,15 +232,15 @@ COMMON_LIBS = ../lib/liblib.la $(XML_LIBS)
 # Each backend should define a convenience library that compiles
 # all related files within backend directory.  General guideline
 # is to have a ${backend}.c and ${backend}.h.  Some backends also
-# add a few support source files to convience library.
+# add a few support source files to convenience library.
 # Note: automake doesn't really use header files listed here.
 # They are indications that they need to be distributed only.
 libabaton_la_SOURCES = abaton.c abaton.h
 libabaton_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=abaton

-# Each backend should define a stand alone library that gets installed.
+# Each backend should define a stand-alone library that gets installed.
 # This will need to link in a special file ${backend}-s.c that allows
-# the backend to be stand alone and contain all SANE API functions.
+# the backend to be stand-alone and contain all SANE API functions.
 # Also, it will need to link in related convenience library as well as
 # any external libraries required to resolve symbols.
 #
--- a/configure.ac
+++ b/configure.ac
@ -72,7 +72,7 @@ dnl Checks for programs.
 dnl ***********************************************************************
 AC_PATH_PROG(SANE_CONFIG_PATH, sane-config, no)

-dnl Call explicitely before using PKG_*
+dnl Call explicitly before using PKG_*
 PKG_PROG_PKG_CONFIG

 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
@ -105,7 +105,7 @@ AC_CHECK_LIB(m, sqrt, MATH_LIB="-lm")
 AC_SUBST(MATH_LIB)
 case ${host_os} in
  os2*)
-  AC_CHECK_LIB(syslog, sylog, SYSLOG_LIBS="-lsyslog")
+  AC_CHECK_LIB(syslog, syslog, SYSLOG_LIBS="-lsyslog")
  ;;
  beos*)
  AC_CHECK_LIB(be, syslog, SYSLOG_LIBS="-lbe")
@ -589,7 +589,7 @@ AC_ARG_ENABLE(scsibuffersize,
  [set_scsibuffersize="$enableval"], [set_scsibuffersize=131072])
 AC_DEFINE_UNQUOTED(SCSIBUFFERSIZE, $set_scsibuffersize,
                   [SCSI command buffer size])
-dnl FIXME: Move tihs to configuration printout area but probably
+dnl FIXME: Move this to configuration printout area but probably
 dnl but probably needs to be wrapped by what ever uses it so its
 dnl only printed when used.
 echo "scsi buffersize: $set_scsibuffersize"
@ -608,7 +608,7 @@ dnl ****
 dnl IPv6
 dnl ****

-dnl check for IPv6 (can be overriden by --enable-ipv6)
+dnl check for IPv6 (can be overridden by --enable-ipv6)
 if test "$ac_cv_func_getnameinfo" = "yes" \
  && test "$ac_cv_func_getaddrinfo" = "yes" ; then
  SANE_CHECK_IPV6
--- a/include/lalloca.h
+++ b/include/lalloca.h
@ -44,7 +44,7 @@
 #ifndef lalloca_h
 #define lalloca_h

-/* The idea how to do this is from the autoconf documenation */
+/* The idea how to do this is from the autoconf documentation */

 /* AIX requires this to be the first thing in the file.  */
 #if defined(__GNUC__)
--- a/include/sane/sane.h
+++ b/include/sane/sane.h
@ -70,7 +70,7 @@ typedef enum
  }
 SANE_Status;

-/* following are for later sane version, older frontends wont support */
+/* following are for later sane version, older frontends won't support */
 #if 0
 #define SANE_STATUS_WARMING_UP 12 /* lamp not ready, please retry */
 #define SANE_STATUS_HW_LOCKED  13 /* scanner mechanism locked for transport */
--- a/include/sane/sanei.h
+++ b/include/sane/sanei.h
@ -118,7 +118,7 @@ extern "C" {
 * @return
 * - SANE_STATUS_GOOD     - on success
 * - SANE_STATUS_INVAL    - if the value doesn't fit inside the constraint
- *   or any other error occured
+ *   or any other error occurred
 * @sa sanei_constrain_value()
 */

@ -135,7 +135,7 @@ extern "C" {
 * @return
 * - SANE_STATUS_GOOD     - on success
 * - SANE_STATUS_INVAL    - if the function wasn't able to fit value into the
- *   constraint or any other error occured
+ *   constraint or any other error occurred
 * @sa sanei_check_value()
 */

--- a/include/sane/sanei_access.h
+++ b/include/sane/sanei_access.h
@ -45,7 +45,7 @@
 /** @file sanei_access.h
 *  Interface file for the sanei_access functions.
 *
- *  The idea is to provide some simple locking/unlocking mecanism, which
+ *  The idea is to provide some simple locking/unlocking mechanism, which
 *  can be used to protect device access from more than one frontend
 *  simultaneously.
 */
--- a/include/sane/sanei_ir.h
+++ b/include/sane/sanei_ir.h
@ -12,7 +12,7 @@
 * - 2) find the dirt
 * - 3) replace the dirt
 *
- * - 1) is mainly adressed by sanei_ir_spectral_clean
+ * - 1) is mainly addressed by sanei_ir_spectral_clean
 * - 2) by sanei_ir_filter_madmean
 * - 3) by sanei_ir_dilate_mean
 */
@ -185,7 +185,7 @@ sanei_ir_to_8bit (SANE_Parameters * params, const SANE_Uint *in_img,
 * @brief Allocate and initialize logarithmic lookup table
 *
 * @param[in]  len length of table, usually 1 << depth
- * @param[out] lut_ln adress of pointer to allocated table
+ * @param[out] lut_ln address of pointer to allocated table
 *
 * @return
 * - SANE_STATUS_GOOD - success
@ -208,9 +208,9 @@ SANE_Status sanei_ir_ln_table (int len, double **lut_ln);
 * - SANE_STATUS_GOOD - success
 * - SANE_STATUS_NO_MEM - if out of memory
 *
- * This routine is based on the observation that the relation beween the infrared value
+ * This routine is based on the observation that the relation between the infrared value
 * ired and the red value red of an image point can be described by ired = b + a * ln (red).
- * First points are randomly sampled to calculate the linear regression coefficent a.
+ * First points are randomly sampled to calculate the linear regression coefficient a.
 * Then ired' = ired - a  * ln (red) is calculated for each pixel. Finally, the ir' image
 * is scaled between 0 and maximal value. For the logarithms a lookup table is used.
 * Negative films show very little spectral overlap but positive film usually has to be
@ -255,8 +255,8 @@ sanei_ir_filter_mean (const SANE_Parameters * params,
 * @param[in]  in_img pointer to grey scale image
 * @param[out] out_img address of pointer to newly allocated binary image
 * @param[in] win_size Size of filtering window
- * @param[in]  a_val Parameter, below is definetly clean
- * @param[in]  b_val Parameter, above is definetly noisy
+ * @param[in]  a_val Parameter, below is definitely clean
+ * @param[in]  b_val Parameter, above is definitely noisy
 *
 * @return
 * - SANE_STATUS_GOOD - success
@ -267,7 +267,7 @@ sanei_ir_filter_mean (const SANE_Parameters * params,
 * The dirty pixels which we wish to remove are always darker than the real signal. But
 * at high resolutions the scanner may generate some noise and the ired cleaning step can
 * reverse things. So a maximum filter will not do.
- * The second median is replaced by a mean filter to reduce computation time. Inspite of
+ * The second median is replaced by a mean filter to reduce computation time. In spite of
 * these changes Crnojevic's recommendations for the choice of the parameters "a" and "b"
 * are still valid when scaled to the color depth.
 *
--- a/include/sane/sanei_lm983x.h
+++ b/include/sane/sanei_lm983x.h
@ -141,7 +141,7 @@ extern SANE_Status sanei_lm983x_read( SANE_Int fd, SANE_Byte reg,
 *
 * @param fd    - device file descriptor
 * @return
- * - SANE_TRUE  - reset successfuly done
+ * - SANE_TRUE  - reset successfully done
 * - SANE_FALSE - reset failed
 */
 extern SANE_Bool sanei_lm983x_reset( SANE_Int fd );
--- a/include/sane/sanei_pa4s2.h
+++ b/include/sane/sanei_pa4s2.h
@ -54,7 +54,7 @@
 /** @name Options to control interface operations */
 /* @{ */
 #define SANEI_PA4S2_OPT_DEFAULT		0	/* normal mode */
-#define SANEI_PA4S2_OPT_TRY_MODE_UNI	1	/* enable UNI protocoll */
+#define SANEI_PA4S2_OPT_TRY_MODE_UNI	1	/* enable UNI protocol */
 #define SANEI_PA4S2_OPT_ALT_LOCK	2	/* use alternative lock cmd */
 #define SANEI_PA4S2_OPT_NO_EPP		4	/* do not try to use EPP */
 /* @} */
--- a/include/sane/sanei_pp.h
+++ b/include/sane/sanei_pp.h
@ -161,7 +161,7 @@ extern SANE_Byte sanei_pp_inb_ctrl( int fd );
 extern SANE_Byte sanei_pp_inb_epp ( int fd );

 /** Delay execution for some micro-seconds.
- *  Please not, that the accuracy highly depends on your system architechture
+ *  Please note, that the accuracy highly depends on your system architecture
 *  and the time to delay. It is internally implemented as system calls to
 *  gettimeofday().
 *
--- a/include/sane/sanei_scsi.h
+++ b/include/sane/sanei_scsi.h
@ -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()
 */
--- a/include/sane/sanei_thread.h
+++ b/include/sane/sanei_thread.h
@ -101,7 +101,7 @@ extern SANE_Bool sanei_thread_is_valid (SANE_Pid pid);
 *
 *  @note
 *  When using pthreads, this only works for those implementations
- *  that opted to make pthread_t an arithmatic type.  This is *not*
+ *  that opted to make pthread_t an arithmetic type.  This is *not*
 *  required by the POSIX threads specification.  The choice to do
 *  SANE_Pid invalidation by means of a macro rather than a proper
 *  function circumvents to need to pass a pointer.
@ -150,7 +150,7 @@ extern SANE_Pid sanei_thread_begin (int (*func) (void *args), void *args);
 *
 * @return
 * - 0 on success
- * - any other value if an error occured while terminating the task
+ * - any other value if an error occurred while terminating the task
 */
 extern int sanei_thread_kill (SANE_Pid pid);

@ -165,7 +165,7 @@ extern int sanei_thread_kill (SANE_Pid pid);
 *
 * @return
 * - 0 - on success
- * - any other value - if an error occured while sending the signal
+ * - any other value - if an error occurred while sending the signal
 */
 extern int sanei_thread_sendsig (SANE_Pid pid, int sig);

--- a/include/sane/sanei_usb.h
+++ b/include/sane/sanei_usb.h
@ -186,7 +186,7 @@ struct sanei_usb_dev_descriptor
    must be called before sanei_usb_init().

    The sanei_usb subsystem also implements a "development mode". It modifies
-    the XML data file with the actual commands of the test run and attemps to
+    the XML data file with the actual commands of the test run and attempts to
    proceed testing until a mismatching input command is found for which
    input data is required.

@ -246,7 +246,7 @@ extern void sanei_usb_exit (void);

 /** Search for USB devices.
 *
- * Search USB busses for scanner devices.
+ * Search USB buses for scanner devices.
 */
 extern void sanei_usb_scan_devices (void);

@ -390,9 +390,9 @@ extern SANE_Status sanei_usb_reset (SANE_Int dn);
 * @param size size of the data
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
@ -409,8 +409,8 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size);
 * @param size size of the data
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
- * - SANE_STATUS_IO_ERROR - if an error occured during the write
+ * - SANE_STATUS_GOOD - on success
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the write
 * - SANE_STATUS_INVAL - on every other error
 */
 extern SANE_Status
@ -418,7 +418,7 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size);

 /** Send/receive a control message to/from a USB device.
 *
- * This function is only supported for libusb devices and kernel acces with
+ * This function is only supported for libusb devices and kernel access with
 * Linux 2.4.13 and newer.
 * For a detailed explanation of the parameters, have a look at the USB
 * specification at the <a href="http://www.usb.org/developers/docs/">
@ -455,9 +455,9 @@ sanei_usb_control_msg (SANE_Int dn, SANE_Int rtype, SANE_Int req,
 * @param size size of the data
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
@ -493,9 +493,9 @@ sanei_usb_attach_matching_devices (const char *name,
 * @param configuration, configuration nummber
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
@ -511,9 +511,9 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration);
 * @param interface_number interface number
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
@ -529,9 +529,9 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number);
 * @param interface_number interface number
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
@ -547,9 +547,9 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number);
 * @param alternate, alternate nummber
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_EOF - if zero bytes have been read
- * - SANE_STATUS_IO_ERROR - if an error occured during the read
+ * - SANE_STATUS_IO_ERROR - if an error occurred during the read
 * - SANE_STATUS_INVAL - on every other error
 *
 */
@ -566,7 +566,7 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate);
 * @param desc where to put the information to
 *
 * @return
- * - SANE_STATUS_GOOD - on succes
+ * - SANE_STATUS_GOOD - on success
 * - SANE_STATUS_UNSUPPORTED - if the feature is not supported by the OS or
 *   SANE.
 * - SANE_STATUS_INVAL - on every other error
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@ -549,7 +549,7 @@
 	union value *value, int base, int dosign,
 	int ljust, int len, int zpad, int precision );
 #endif
- static void fmtdouble( char **bufer, int *left,
+ static void fmtdouble( char **buffer, int *left,
 	int fmt, double value,
 	int ljust, int len, int zpad, int precision );
 static void dostr(  char **buffer, int *left, char *str );
--- a/sanei/sanei_DomainOS.c
+++ b/sanei/sanei_DomainOS.c
@ -112,7 +112,7 @@ static struct
   scsi_$operation_id_t op_id;  /* op_id of current request */
   } *DomainFdInfo;

-/* This function is called error might have occured, but it would be one that I
+/* This function is called error might have occurred, but it would be one that I
 don't know how to handle, or never expect to happen.  */
 static void DomainErrorCheck(status_$t status, const char *message)
   {
--- a/sanei/sanei_DomainOS.h
+++ b/sanei/sanei_DomainOS.h
@ -37,7 +37,7 @@ To send an enter command to the server, follow these steps:
 /* Amount of data in a sense request */
 #define DomainSenseSize 18

-/* Maximum amound of data in a transfer, per Domain/OS SCSI spec */
+/* Maximum amount of data in a transfer, per Domain/OS SCSI spec */
 #define DomainMaxDataSize (32 * 1024)

 /* Timeout for ec2_$wait calls, in 1/4 second intervals */
--- a/sanei/sanei_magic.c
+++ b/sanei/sanei_magic.c
@ -130,7 +130,7 @@ sanei_magic_despeck (SANE_Parameters * params, SANE_Byte * buffer,

            int tmp[3];

-            /* dont count pixels in the window */
+            /* don't count pixels in the window */
            if(k != -1 && k != diam && l != -1 && l != diam)
              continue;

@ -189,7 +189,7 @@ sanei_magic_despeck (SANE_Parameters * params, SANE_Byte * buffer,

            int tmp = 0;

-            /* dont count pixels in the window */
+            /* don't count pixels in the window */
            if(k != -1 && k != diam && l != -1 && l != diam)
              continue;

@ -239,7 +239,7 @@ sanei_magic_despeck (SANE_Parameters * params, SANE_Byte * buffer,
        for(k=-1; k<diam+1; k++){
          for(l=-1; l<diam+1; l++){

-            /* dont count pixels in the window */
+            /* don't count pixels in the window */
            if(k != -1 && k != diam && l != -1 && l != diam)
              continue;

@ -366,7 +366,7 @@ sanei_magic_findEdges(SANE_Parameters * params, SANE_Byte * buffer,
  }

  /* loop thru top and bottom lists, look for l and r extremes
-   * NOTE: We dont look above the top or below the bottom found previously.
+   * NOTE: We don't look above the top or below the bottom found previously.
   * This prevents issues with adf scanners that pad the image after the
   * paper runs out (usually with white) */
  DBG (5, "sanei_magic_findEdges: bb0:%d tb0:%d b:%d t:%d\n",
@ -534,14 +534,14 @@ sanei_magic_findSkew(SANE_Parameters * params, SANE_Byte * buffer,
  /* get buffers for edge detection */
  topBuf = sanei_magic_getTransY(params,dpiY,buffer,1);
  if(!topBuf){
-    DBG (5, "sanei_magic_findSkew: cant gTY\n");
+    DBG (5, "sanei_magic_findSkew: can't gTY\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }

  botBuf = sanei_magic_getTransY(params,dpiY,buffer,0);
  if(!botBuf){
-    DBG (5, "sanei_magic_findSkew: cant gTY\n");
+    DBG (5, "sanei_magic_findSkew: can't gTY\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }
@ -1419,7 +1419,7 @@ getLine (int height, int width, int * buff,
  /* build an array of pretty-print values for slope */
  slopeCenter = calloc(slopes,sizeof(double));
  if(!slopeCenter){
-    DBG(5,"getLine: cant load slopeCenter\n");
+    DBG(5,"getLine: can't load slopeCenter\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }
@ -1427,7 +1427,7 @@ getLine (int height, int width, int * buff,
  /* build an array of scaling factors for slope */
  slopeScale = calloc(slopes,sizeof(int));
  if(!slopeScale){
-    DBG(5,"getLine: cant load slopeScale\n");
+    DBG(5,"getLine: can't load slopeScale\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }
@ -1448,7 +1448,7 @@ getLine (int height, int width, int * buff,
  /* build an array of pretty-print values for offset */
  offsetCenter = calloc(offsets,sizeof(double));
  if(!offsetCenter){
-    DBG(5,"getLine: cant load offsetCenter\n");
+    DBG(5,"getLine: can't load offsetCenter\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }
@ -1456,7 +1456,7 @@ getLine (int height, int width, int * buff,
  /* build an array of scaling factors for offset */
  offsetScale = calloc(offsets,sizeof(int));
  if(!offsetScale){
-    DBG(5,"getLine: cant load offsetScale\n");
+    DBG(5,"getLine: can't load offsetScale\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }
@ -1477,14 +1477,14 @@ getLine (int height, int width, int * buff,
  /* build 2-d array of 'density', divided into slope and offset ranges */
  lines = calloc(slopes, sizeof(int *));
  if(!lines){
-    DBG(5,"getLine: cant load lines\n");
+    DBG(5,"getLine: can't load lines\n");
    ret = SANE_STATUS_NO_MEM;
    goto cleanup;
  }

  for(i=0;i<slopes;i++){
    if(!(lines[i] = calloc(offsets, sizeof(int)))){
-      DBG(5,"getLine: cant load lines %d\n",i);
+      DBG(5,"getLine: can't load lines %d\n",i);
      ret = SANE_STATUS_NO_MEM;
      goto cleanup;
    }
@ -1533,7 +1533,7 @@ getLine (int height, int width, int * buff,
  *finDensity = 0;

  /* go thru array, and scale densities to % of maximum, plus adjust for
-   * prefered (smaller absolute value) slope and offset */
+   * preferred (smaller absolute value) slope and offset */
  for(i=0;i<slopes;i++){
    for(j=0;j<offsets;j++){
      lines[i][j] = (float)lines[i][j] / maxDensity * slopeScale[i] * offsetScale[j];
@ -1567,7 +1567,7 @@ getLine (int height, int width, int * buff,
    }
  }

-  /* dont forget to cleanup */
+  /* don't forget to cleanup */
  cleanup:
  for(i=0;i<slopes;i++){
    if(lines[i])
--- a/sanei/sanei_pa4s2.c
+++ b/sanei/sanei_pa4s2.c
@ -202,7 +202,7 @@ typedef struct
 #endif
    u_int in_use;		/* port in use? */
    u_int enabled;		/* port enabled? */
-    u_int mode;			/* protocoll */
+    u_int mode;			/* protocol */
    u_char prelock[3];		/* state of port */
 #ifdef HAVE_LIBIEEE1284
    int caps;
@ -750,7 +750,7 @@ pa4s2_writebyte_any (int fd, u_char reg, u_char val)
  /* somebody from Mustek asked me once, why I was writing the same
     value repeatedly to a port. Well, actually I don't know, it just
     works. Maybe the repeated writes could be replaced by appropriate
-     delays or even left out completly.
+     delays or even left out completely.
   */
 #if defined(HAVE_LIBIEEE1284)
  DBG (6, "pa4s2_writebyte_any: writing value 0x%02x"
@ -1922,7 +1922,7 @@ sanei_pa4s2_open (const char *dev, int *fd)
  DBG (6, "sanei_pa4s2_open: basically, this backend does only compile\n");
  DBG (6, "sanei_pa4s2_open: on x86 architectures. Furthermore it\n");
  DBG (6, "sanei_pa4s2_open: needs ioperm() and inb()/outb() calls.\n");
-  DBG (6, "sanei_pa4s2_open: alternativly it makes use of libieee1284\n");
+  DBG (6, "sanei_pa4s2_open: alternatively it makes use of libieee1284\n");
  DBG (6, "sanei_pa4s2_open: (which isn't present either)\n");
  DBG (5, "sanei_pa4s2_open: returning SANE_STATUS_INVAL\n");

--- a/sanei/sanei_pio.c
+++ b/sanei/sanei_pio.c
@ -45,7 +45,7 @@
 /*
  RESTRICTIONS:

-  - This interface is very timing sensitive, be carefull with setting
+  - This interface is very timing sensitive, be careful with setting
    debug levels.
 */

--- a/sanei/sanei_pp.c
+++ b/sanei/sanei_pp.c
@ -1333,7 +1333,7 @@ sanei_pp_open( const char *dev, int *fd )
 	DBG( 6, "sanei_pp_open: basically, this backend does only compile\n" );
 	DBG( 6, "sanei_pp_open: on x86 architectures. Furthermore it\n" );
 	DBG( 6, "sanei_pp_open: needs ioperm() and inb()/outb() calls.\n" );
-	DBG( 6, "sanei_pp_open: alternativly it makes use of libieee1284\n" );
+	DBG( 6, "sanei_pp_open: alternatively it makes use of libieee1284\n" );
 	DBG( 6, "sanei_pp_open: (which isn't present either)\n");
 	return SANE_STATUS_INVAL;
 }
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@ -173,7 +173,7 @@
 # include <sys/scsi/targets/scgio.h>
 #elif defined (HAVE_SYS_SCSI_SCSI_H)
  /*
-   * the "offical" solaris uscsi(7I) interface; comes last, so that users
+   * the "official" solaris uscsi(7I) interface; comes last, so that users
   * installing the SCG/SG driver can still use these generic scsi interfaces
   */
 # define USE SOLARIS_USCSI_INTERFACE
@ -347,7 +347,7 @@ int sanei_scsi_max_request_size = MAX_DATA;
 #endif

 /* the struct returned by the SG ioctl call SG_GET_SCSI_ID changed
-   from version 2.1.34 to 2.1.35, and we need the informations from
+   from version 2.1.34 to 2.1.35, and we need the information from
   the field s_queue_depth, which was introduced in 2.1.35.
   To get this file compiling also with older versions of sg.h, the
   struct is re-defined here.
@ -383,7 +383,7 @@ typedef struct req
    {
      struct sg_header hdr;
      /* Make sure this is the last element, the real size is
-         SG_BIG_BUFF and machine dependant */
+         SG_BIG_BUFF and machine dependent */
      u_int8_t data[1];
    }
    cdb;
@ -2298,7 +2298,7 @@ issue (struct req *req)
 		     /* this is messy... Sometimes it happens that we have
 		        a valid looking sense buffer, but the DRIVER_SENSE
 		        bit is not set. Moreover, we can check this only for
-		        not tooo old SG drivers
+		        not too old SG drivers
 		      */
 		     && (req->sgdata.cdb.hdr.driver_status & DRIVER_SENSE)
 #endif
@ -2347,7 +2347,7 @@ issue (struct req *req)
 		      status = SANE_STATUS_DEVICE_BUSY;
 		    else if (handler)
 		      /* sense handler should return SANE_STATUS_GOOD if it
-		         decided all was ok afterall */
+		         decided all was ok after all */
 		      status =
 			(*handler) (req->fd, req->sgdata.cdb.hdr.sense_buffer,
 				    arg);
@ -2415,7 +2415,7 @@ issue (struct req *req)
 		      status = SANE_STATUS_DEVICE_BUSY;
 		    else if (handler && req->sgdata.sg3.hdr.sb_len_wr)
 		      /* sense handler should return SANE_STATUS_GOOD if it
-		         decided all was ok afterall */
+		         decided all was ok after all */
 		      status =
 			(*handler) (req->fd, req->sgdata.sg3.sense_buffer,
 				    arg);
@ -3833,12 +3833,12 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
 * (c) R=I+S Rapp Informatik System Germany
 * Email: wolfgang@rapp-informatik.de
 *
- * The driver version should run with other scsi componets like disk
+ * The driver version should run with other scsi components like disk
 * attached to the same controller at the same time.
 *
 * Attention : This port needs a sane kernel driver for Unixware 2.x
 * The driver is available in binary pkgadd format
- * Plese mail me.
+ * Please mail me.
 *
 */
  SANE_Status
@ -3978,7 +3978,7 @@ sanei_scsi_find_devices (const char *findvendor, const char *findmodel,
 #ifdef UWSUPPORTED		/* at this time not supported by driver */
 	  if (sb_ptr->SCB.sc_comp_code != SDI_ASW)
 	    {
-	      DBG (1, "sanei_scsi_cmd: scsi_cmd failture %x\n",
+	      DBG (1, "sanei_scsi_cmd: scsi_cmd failure %x\n",
 		   sb_ptr->SCB.sc_comp_code);
 	      if (sb_ptr->SCB.sc_comp_code == SDI_CKSTAT
 		  && sb_ptr->SCB.sc_status == S_CKCON)
--- a/sanei/sanei_thread.c
+++ b/sanei/sanei_thread.c
@ -113,7 +113,7 @@ sanei_thread_is_forked( void )
 #endif
 }

-/* Use this to mark a SANE_Pid as invaild instead of marking with -1.
+/* Use this to mark a SANE_Pid as invalid instead of marking with -1.
 */
 #ifdef USE_PTHREAD
 static void
--- a/sanei/sanei_usb.c
+++ b/sanei/sanei_usb.c
@ -506,7 +506,7 @@ SANE_Status sanei_usb_testing_enable_replay(SANE_String_Const path,
  testing_mode = sanei_usb_testing_mode_replay;
  testing_development_mode = development_mode;

-  // TODO: we'll leak if noone ever inits sane_usb properly
+  // TODO: we'll leak if no one ever inits sane_usb properly
  testing_xml_path = strdup(path);
  testing_xml_doc = xmlReadFile(testing_xml_path, NULL, 0);
  if (!testing_xml_doc)
@ -1443,7 +1443,7 @@ sanei_usb_init (void)
  /* sanei_usb is now initialized */
  initialized++;

-  /* do a first scan of USB busses to fill device list */
+  /* do a first scan of USB buses to fill device list */
  sanei_usb_scan_devices();
 }

@ -2221,7 +2221,7 @@ static const char* sanei_usb_transfer_type_desc(SANE_Int transfer_type)
  return NULL;
 }

-// Similar sanei_usb_set_endpoint, but ignors duplicate endpoints
+// Similar sanei_usb_set_endpoint, but ignores duplicate endpoints
 static void sanei_usb_add_endpoint(device_list_type* device,
                                   SANE_Int transfer_type,
                                   SANE_Int ep_address,