From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- backend/magicolor.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'backend/magicolor.c') diff --git a/backend/magicolor.c b/backend/magicolor.c index 660f517..d3af142 100644 --- a/backend/magicolor.c +++ b/backend/magicolor.c @@ -1385,7 +1385,6 @@ static SANE_Status mc_init_parameters(Magicolor_Scanner * s) { int dpi, optres; - struct mode_param *mparam; DBG(5, "%s\n", __func__); @@ -1394,8 +1393,6 @@ mc_init_parameters(Magicolor_Scanner * s) dpi = s->val[OPT_RESOLUTION].w; optres = s->hw->cap->optical_res; - mparam = &mode_params[s->val[OPT_MODE].w]; - if (SANE_UNFIX(s->val[OPT_BR_Y].w) == 0 || SANE_UNFIX(s->val[OPT_BR_X].w) == 0) return SANE_STATUS_INVAL; @@ -1521,6 +1518,7 @@ mc_read(struct Magicolor_Scanner *s) ****************************************************************************/ +#if HAVE_LIBSNMP static struct MagicolorCap * mc_get_device_from_identification (const char*ident) { @@ -1531,6 +1529,7 @@ mc_get_device_from_identification (const char*ident) } return NULL; } +#endif /* @@ -1970,10 +1969,10 @@ mc_network_discovery(const char*host) init_snmp("sane-magicolor-backend"); snmp_sess_init (&session); session.version = SNMP_VERSION_2c; - session.community = "public"; - session.community_len = strlen (session.community); + session.community = (u_char *) "public"; + session.community_len = strlen ((char *)session.community); if (host) { - session.peername = host; + session.peername = (char *) host; } else { /* Do a network discovery via a broadcast */ session.peername = "255.255.255.255"; -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- backend/magicolor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'backend/magicolor.c') diff --git a/backend/magicolor.c b/backend/magicolor.c index d3af142..3b27a85 100644 --- a/backend/magicolor.c +++ b/backend/magicolor.c @@ -1288,9 +1288,10 @@ mc_scan_finish(Magicolor_Scanner * s) status = cmd_finish_scan (s); status = cmd_request_error(s); - if (status != SANE_STATUS_GOOD) + if (status != SANE_STATUS_GOOD) { cmd_cancel_scan (s); return status; + } /* XXX required? */ /* TODO: cmd_reset(s);*/ @@ -2050,7 +2051,7 @@ mc_network_discovery(const char*host) fd_set fdset; DBG(1, " loop=%d\n", i++); timeout.tv_sec = 0; - /* Use a 125ms timeout for select. If we get a response, + /* Use a 125ms timeout for select. If we get a response, * the loop will be entered earlier again, anyway */ timeout.tv_usec = 125000; FD_ZERO (&fdset); @@ -2193,7 +2194,7 @@ attach_one_config(SANEI_Config __sane_unused__ *config, const char *line) /* Timeout for all other read requests */ DBG(50, "%s: Request timeout set to %d\n", __func__, timeout); MC_Request_Timeout = timeout; - + } else { /* TODO: Warning about unparsable line! */ } @@ -2414,7 +2415,7 @@ init_options(Magicolor_Scanner *s) s->opt[OPT_SOURCE].constraint_type = SANE_CONSTRAINT_STRING_LIST; s->opt[OPT_SOURCE].constraint.string_list = source_list; s->val[OPT_SOURCE].w = 0; /* always use Flatbed as default */ - + s->opt[OPT_ADF_MODE].name = "adf-mode"; s->opt[OPT_ADF_MODE].title = SANE_I18N("ADF Mode"); s->opt[OPT_ADF_MODE].desc = -- cgit v1.2.3 From ffa8801644a7d53cc1c785e3450f794c07a14eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Feb 2020 17:13:01 +0100 Subject: New upstream version 1.0.29 --- backend/magicolor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'backend/magicolor.c') diff --git a/backend/magicolor.c b/backend/magicolor.c index 3b27a85..af9fb1a 100644 --- a/backend/magicolor.c +++ b/backend/magicolor.c @@ -2789,12 +2789,11 @@ setvalue(SANE_Handle handle, SANE_Int option, void *value, SANE_Int *info) case OPT_BR_X: case OPT_BR_Y: - sval->w = *((SANE_Word *) value); - if (SANE_UNFIX(sval->w) == 0) { + if (SANE_UNFIX(*((SANE_Word *) value)) == 0) { DBG(17, "invalid br-x or br-y\n"); return SANE_STATUS_INVAL; } - /* passthru */ + // fall through case OPT_TL_X: case OPT_TL_Y: sval->w = *((SANE_Word *) value); -- cgit v1.2.3