summaryrefslogtreecommitdiff
path: root/backend/canon_lide70.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:10 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:10 +0100
commite0d94cf4d39395df1e2c6bb4d967200298c13881 (patch)
treebe5c7cace6697afc753c152d13ad5145d0884a42 /backend/canon_lide70.c
parent527bedac30eb120915718eb7997e6dacd583512e (diff)
parent84357741a6a6e6430f199b2c3f7498e0e97da9ad (diff)
Update upstream source from tag 'upstream/1.2.1'
Update to upstream version '1.2.1' with Debian dir a9bb43f754a5c9a361b076af3635cc767b7e652e
Diffstat (limited to 'backend/canon_lide70.c')
-rw-r--r--backend/canon_lide70.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/canon_lide70.c b/backend/canon_lide70.c
index 4cc8999..2a3bd30 100644
--- a/backend/canon_lide70.c
+++ b/backend/canon_lide70.c
@@ -819,8 +819,8 @@ sane_control_option (SANE_Handle handle, SANE_Int option, SANE_Action action,
"sane_control_option: get option %d (%s), value=%.1f %s\n",
option, chndl->opt[option].name,
SANE_UNFIX (*(SANE_Fixed *) value),
- chndl->opt[option].unit ==
- SANE_UNIT_MM ? "mm" : SANE_UNIT_DPI ? "dpi" : "");
+ chndl->opt[option].unit == SANE_UNIT_MM ? "mm" :
+ (chndl->opt[option].unit == SANE_UNIT_DPI ? "dpi" : ""));
break;
}
case opt_non_blocking:
@@ -863,7 +863,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
Canon_Scanner *hndl = handle; /* Eliminate compiler warning */
CANON_Handle *chndl = &hndl->scan;
- int rc = SANE_STATUS_GOOD;
+ SANE_Status rc = SANE_STATUS_GOOD;
int w = SANE_UNFIX (chndl->val[opt_br_x].w -
chndl->val[opt_tl_x].w) / MM_IN_INCH *
chndl->val[opt_resolution].w;
@@ -956,7 +956,7 @@ sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
SANE_Status
sane_get_select_fd (SANE_Handle handle, SANE_Int * fd)
{
- handle = handle; /* silence gcc */
- fd = fd; /* silence gcc */
+ (void) handle; /* silence gcc */
+ (void) fd; /* silence gcc */
return SANE_STATUS_UNSUPPORTED;
}