diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 |
| commit | 9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch) | |
| tree | c9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/xerox_mfp.c | |
| parent | 446e9454b8cbe5b689149415d11d36e88442ca88 (diff) | |
| parent | 154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff) | |
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
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++; |