diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:20 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:20 +0200 |
| commit | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch) | |
| tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/pixma_io_sanei.c | |
| parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
| parent | 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff) | |
Update upstream source from tag 'upstream/1.0.28'
Update to upstream version '1.0.28'
with Debian dir ec5bb298266630fc3801ff6dc0c258f6df7ba979
Diffstat (limited to 'backend/pixma_io_sanei.c')
| -rw-r--r-- | backend/pixma_io_sanei.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c index 8eec883..4710cf4 100644 --- a/backend/pixma_io_sanei.c +++ b/backend/pixma_io_sanei.c @@ -1,7 +1,7 @@ /* SANE - Scanner Access Now Easy. * For limitations, see function sanei_usb_get_vendor_product(). - Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de> + Copyright (C) 2011-2019 Rolf Bensch <rolf at bensch hyphen online dot de> Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de> This file is part of the SANE package. @@ -106,9 +106,9 @@ get_scanner_info (unsigned devnr) return si; } -static const struct pixma_config_t *lookup_scanner(const char *makemodel, +static const struct pixma_config_t *lookup_scanner(const char *makemodel, const struct pixma_config_t *const pixma_devices[]) -{ +{ int i; const struct pixma_config_t *cfg; char *match; @@ -120,12 +120,12 @@ static const struct pixma_config_t *lookup_scanner(const char *makemodel, { /* loop through devices in class */ if ((match = strcasestr (makemodel, cfg->model)) != NULL) - { + { /* possible match found, make sure it is not a partial match */ /* MP600 and MP600R are different models! */ /* some models contain ranges, so check for a '-' too */ - if ((match[strlen(cfg->model)] == ' ') || + if ((match[strlen(cfg->model)] == ' ') || (match[strlen(cfg->model)] == '\0') || (match[strlen(cfg->model)] == '-')) { @@ -159,8 +159,8 @@ attach (SANE_String_Const devname) static SANE_Status -attach_bjnp (SANE_String_Const devname, SANE_String_Const makemodel, - SANE_String_Const serial, +attach_bjnp (SANE_String_Const devname, SANE_String_Const makemodel, + SANE_String_Const serial, const struct pixma_config_t *const pixma_devices[]) { scanner_info_t *si; @@ -417,7 +417,7 @@ pixma_connect (unsigned devnr, pixma_io_t ** handle) error = map_error (sanei_bjnp_open (si->devname, &dev)); else error = map_error (sanei_usb_open (si->devname, &dev)); - + if (error < 0) return error; io = (pixma_io_t *) calloc (1, sizeof (*io)); @@ -425,7 +425,7 @@ pixma_connect (unsigned devnr, pixma_io_t ** handle) { if (si -> interface == INT_BJNP) sanei_bjnp_close (dev); - else + else sanei_usb_close (dev); return PIXMA_ENOMEM; } |