diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
| commit | ecaaf250cb33ff61f37a7b441f2337584a655350 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /backend/xerox_mfp.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | 351b7328520c16730ceb46e5acae16038c42185e (diff) | |
Update upstream source from tag 'upstream/1.0.32'
Update to upstream version '1.0.32'
with Debian dir 2c1111c59d9d68bcbf479a4a4de7697fe2de127f
Diffstat (limited to 'backend/xerox_mfp.c')
| -rw-r--r-- | backend/xerox_mfp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c index f5fd70e..edd6e64 100644 --- a/backend/xerox_mfp.c +++ b/backend/xerox_mfp.c @@ -518,7 +518,7 @@ static void reset_options(struct device *dev) dev->val[OPT_RESOLUTION].w = 150; dev->val[OPT_MODE].s = string_match(scan_modes, SANE_VALUE_SCAN_MODE_COLOR); - /* if docs loaded in adf use it as default source, flatbed oterwise */ + /* if docs loaded in adf use it as default source, flatbed otherwise */ dev->val[OPT_SOURCE].s = UNCONST(doc_sources[(dev->doc_loaded)? 1 : 0]); dev->val[OPT_THRESHOLD].w = SANE_FIX(50); @@ -1028,7 +1028,8 @@ list_one_device(SANE_String_Const devname) /* SANE API ignores return code of this callback */ static SANE_Status -list_conf_devices(UNUSED(SANEI_Config *config), const char *devname) +list_conf_devices(SANEI_Config __sane_unused__ *config, const char *devname, + void __sane_unused__ *data) { return tr_from_devname(devname)->configure_device(devname, list_one_device); } @@ -1080,7 +1081,7 @@ sane_get_devices(const SANE_Device *** device_list, SANE_Bool local) config.count = 0; config.descriptors = NULL; config.values = NULL; - sanei_configure_attach(XEROX_CONFIG_FILE, &config, list_conf_devices); + sanei_configure_attach(XEROX_CONFIG_FILE, &config, list_conf_devices, NULL); for (dev_count = 0, dev = devices_head; dev; dev = dev->next) dev_count++; |