New upstream version 1.2.1upstream/1.2.1upstream

1 files changed, 5 insertions, 7 deletions

diff --git a/backend/hp4200.c b/backend/hp4200.c
index 5b21b47..e4e885e 100644
--- a/backend/hp4200.c
+++ b/backend/hp4200.c
@@ -512,7 +512,7 @@ read_available_data (HP4200_Scanner * s, SANE_Byte * buffer,
       buffer += really_read;
       to_read -= really_read;
 #ifdef DEBUG
-      fprintf (stderr, "read %d bytes\n", really_read);
+      fprintf (stderr, "read %zu bytes\n", really_read);
 #endif
     }
   return SANE_STATUS_GOOD;
@@ -941,7 +941,6 @@ compute_dpd (HP4200_Scanner * s, int step_size, int line_end)
 static SANE_Status
 read_required_bytes (HP4200_Scanner * s, int required, SANE_Byte * buffer)
 {
-  int read_count = 0;
   unsigned char scankb1;
   unsigned char scankb2;
   size_t to_read;
@@ -987,7 +986,6 @@ read_required_bytes (HP4200_Scanner * s, int required, SANE_Byte * buffer)
 	  buffer += really_read;
 	  required -= really_read;
 	  to_read -= really_read;
-	  read_count += really_read;
 	}
     }
 
@@ -2369,7 +2367,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   char dev_name[PATH_MAX];
   FILE *fp;
 
-  authorize = authorize;	/* keep gcc quiet */
+  (void) authorize;		/* keep gcc quiet */
 
   DBG_INIT ();
 
@@ -2939,7 +2937,7 @@ sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
   HP4200_Scanner *dev = handle;
   SANE_Status status;
 
-  non_blocking = non_blocking;	/* silence gcc */
+  (void) non_blocking;		/* silence gcc */
 
   if (dev->scanning == SANE_FALSE)
     {
@@ -2965,8 +2963,8 @@ sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
 {
   static char me[] = "sane_get_select_fd";
 
-  h = h;			/* keep gcc quiet */
-  fd = fd;			/* keep gcc quiet */
+  (void) h;			/* keep gcc quiet */
+  (void) fd;			/* keep gcc quiet */
 
   DBG (DBG_proc, "%s\n", me);
   return SANE_STATUS_UNSUPPORTED;