move from support/1.0.27 to feature/1.0.27

1 files changed, 6 insertions, 12 deletions

diff --git a/backend/v4l.c b/backend/v4l.c
index 519bf01..1e032c7 100644
--- a/backend/v4l.c
+++ b/backend/v4l.c
@@ -495,13 +495,12 @@ sane_exit (void)
 }
 
 SANE_Status
-sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
+sane_get_devices (const SANE_Device *** device_list, SANE_Bool __sane_unused__ local_only)
 {
   V4L_Device *dev;
   int i;
 
   DBG (5, "sane_get_devices\n");
-  local_only = SANE_TRUE;	/* Avoid compile warning */
 
   if (devlist)
     free (devlist);
@@ -962,7 +961,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
 SANE_Status
 sane_start (SANE_Handle handle)
 {
-  int len, loop;
+  int len;
   V4L_Scanner *s;
   char data;
 
@@ -998,6 +997,7 @@ sane_start (SANE_Handle handle)
     }
   else
     {
+      int loop;
       s->is_mmap = SANE_TRUE;
       DBG (3,
 	   "sane_start: mmap frame, buffersize: %d bytes, buffers: %d, offset 0 %d\n",
@@ -1046,6 +1046,7 @@ sane_start (SANE_Handle handle)
   /* v4l1 actually returns BGR when we ask for RGB, so convert it */
   if (s->pict.palette == VIDEO_PALETTE_RGB24)
     {
+      __u32 loop;
       DBG (3, "sane_start: converting from BGR to RGB\n");
       for (loop = 0; loop < (s->window.width * s->window.height * 3); loop += 3)
         {
@@ -1130,22 +1131,15 @@ sane_cancel (SANE_Handle handle)
 
 
 SANE_Status
-sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle, SANE_Bool non_blocking)
 {
-  /* Avoid compile warning */
-  handle = 0;
-
   if (non_blocking == SANE_FALSE)
     return SANE_STATUS_GOOD;
   return SANE_STATUS_UNSUPPORTED;
 }
 
 SANE_Status
-sane_get_select_fd (SANE_Handle handle, SANE_Int * fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle, SANE_Int __sane_unused__ * fd)
 {
-  /* Avoid compile warning */
-  handle = 0;
-  fd = 0;
-
   return SANE_STATUS_UNSUPPORTED;
 }