Merge branch 'feature/upstream' into develop

1 files changed, 22 insertions, 22 deletions

diff --git a/backend/umax1220u.c b/backend/umax1220u.c
index 8c6098c..e5ecbef 100644
--- a/backend/umax1220u.c
+++ b/backend/umax1220u.c
@@ -131,9 +131,9 @@ static SANE_Status
 optionNumOptionsCallback (SANE_Option * option, SANE_Handle handle,
                           SANE_Action action, void *value, SANE_Int * info)
 {
-  option = option;
-  handle = handle;
-  info = info;    /* Eliminate warning about unused parameters */
+  (void) option;
+  (void) handle;
+  (void) info;                  /* Eliminate warning about unused parameters */
 
   if (action != SANE_ACTION_GET_VALUE)
     return SANE_STATUS_INVAL;
@@ -173,7 +173,7 @@ optionResolutionCallback (SANE_Option * option, SANE_Handle handle,
   SANE_Status status;
   SANE_Word autoValue = 75;
 
-  handle = handle;     /* Eliminate warning about unused parameters */
+  (void) handle;                /* Eliminate warning about unused parameters */
 
   switch (action)
     {
@@ -217,8 +217,8 @@ static SANE_Status
 optionGrayscaleCallback (SANE_Option * option, SANE_Handle handle,
                          SANE_Action action, void *value, SANE_Int * info)
 {
-  handle = handle;
-  option = option;     /* Eliminate warning about unused parameters */
+  (void) handle;
+  (void) option;                /* Eliminate warning about unused parameters */
 
   switch (action)
     {
@@ -261,10 +261,10 @@ optionLampOffCallback (SANE_Option * option, SANE_Handle handle,
   SANE_Status res = SANE_STATUS_GOOD;
 
   /* Eliminate warnings about unused parameters */
-  option = option;
-  handle = handle;
-  info   = info;
-  value  = value;
+  (void) option;
+  (void) handle;
+  (void) info;
+  (void) value;
 
   if (action != SANE_ACTION_SET_VALUE)
     return SANE_STATUS_INVAL;
@@ -308,9 +308,9 @@ static SANE_Status
 optionTopLeftXCallback (SANE_Option * option, SANE_Handle handle,
                         SANE_Action action, void *value, SANE_Int * info)
 {
-  option = option;
-  handle = handle;
-  value  = value;      /* Eliminate warning about unused parameters */
+  (void) option;
+  (void) handle;
+  (void) value;                 /* Eliminate warning about unused parameters */
 
   switch (action)
     {
@@ -351,8 +351,8 @@ optionTopLeftYCallback (SANE_Option * option, SANE_Handle handle,
                         SANE_Action action, void *value, SANE_Int * info)
 {
   /* Eliminate warnings about unused parameters */
-  option = option;
-  handle = handle;
+  (void) option;
+  (void) handle;
 
   switch (action)
     {
@@ -394,8 +394,8 @@ optionBotRightXCallback (SANE_Option * option, SANE_Handle handle,
                          SANE_Action action, void *value, SANE_Int * info)
 {
   /* Eliminate warnings about unused parameters */
-  option = option;
-  handle = handle;
+  (void) option;
+  (void) handle;
 
   switch (action)
     {
@@ -437,8 +437,8 @@ optionBotRightYCallback (SANE_Option * option, SANE_Handle handle,
                          SANE_Action action, void *value, SANE_Int * info)
 {
   /* Eliminate warnings about unused parameters */
-  option = option;
-  handle = handle;
+  (void) option;
+  (void) handle;
 
   switch (action)
     {
@@ -780,7 +780,7 @@ sane_close (SANE_Handle handle)
 const SANE_Option_Descriptor *
 sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 {
-  handle = handle;                /* Eliminate compiler warning */
+  (void) handle;                /* Eliminate compiler warning */
 
   DBG (3, "sane_get_option_descriptor: option = %d\n", option);
   if (option < 0 || option >= NELEMS (so))
@@ -792,7 +792,7 @@ SANE_Status
 sane_control_option (SANE_Handle handle, SANE_Int option,
                      SANE_Action action, void *value, SANE_Int * info)
 {
-  handle = handle;                /* Eliminate compiler warning */
+  (void) handle;                /* Eliminate compiler warning */
 
   DBG (3,
        "sane_control_option: handle=%p, opt=%d, act=%d, val=%p, info=%p\n",
@@ -812,7 +812,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
     SANE_UNFIX (optionBotRightYValue -
                 optionTopLeftYValue) / MM_IN_INCH * optionResolutionValue;
 
-  handle = handle;                /* Eliminate compiler warning */
+  (void) handle;                /* Eliminate compiler warning */
 
   DBG (3, "sane_get_parameters\n");
   parms.depth = 8;