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/canon-sane.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'backend/canon-sane.c') diff --git a/backend/canon-sane.c b/backend/canon-sane.c index 79ce0ba..a8efc7a 100644 --- a/backend/canon-sane.c +++ b/backend/canon-sane.c @@ -1,5 +1,5 @@ SANE_Status -sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize) +sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize) { char devnam[PATH_MAX] = "/dev/scanner"; FILE *fp; @@ -107,7 +107,7 @@ sane_exit (void) SANE_Status sane_get_devices (const SANE_Device *** device_list, -SANE_Bool UNUSEDARG local_only) +SANE_Bool __sane_unused__ local_only) { static const SANE_Device **devlist = 0; CANON_Device *dev; @@ -1104,7 +1104,6 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters *params) SANE_Status sane_start (SANE_Handle handle) { - int mode; char *mode_str; CANON_Scanner *s = handle; SANE_Status status; @@ -1301,33 +1300,27 @@ sane_start (SANE_Handle handle) if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_LINEART)) { - mode = 4; s->image_composition = 0; } else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_HALFTONE)) { - mode = 4; s->image_composition = 1; } else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_GRAY)) { - mode = 5; s->image_composition = 2; } else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_COLOR) || !strcmp (mode_str, SANE_I18N("Fine color"))) { - mode = 6; s->image_composition = 5; } else if (!strcmp (mode_str, SANE_I18N("Raw"))) { - mode = 6; s->image_composition = 5; } else { - mode = 6; s->image_composition = 5; } @@ -2206,8 +2199,8 @@ sane_cancel (SANE_Handle handle) /**************************************************************************/ SANE_Status -sane_set_io_mode (SANE_Handle UNUSEDARG handle, -SANE_Bool UNUSEDARG non_blocking) +sane_set_io_mode (SANE_Handle __sane_unused__ handle, +SANE_Bool __sane_unused__ non_blocking) { DBG (1, ">> sane_set_io_mode\n"); DBG (1, "<< sane_set_io_mode\n"); @@ -2217,8 +2210,8 @@ SANE_Bool UNUSEDARG non_blocking) /**************************************************************************/ SANE_Status -sane_get_select_fd (SANE_Handle UNUSEDARG handle, -SANE_Int UNUSEDARG * fd) +sane_get_select_fd (SANE_Handle __sane_unused__ handle, +SANE_Int __sane_unused__ * fd) { DBG (1, ">> sane_get_select_fd\n"); DBG (1, "<< sane_get_select_fd\n"); -- 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/canon-sane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backend/canon-sane.c') diff --git a/backend/canon-sane.c b/backend/canon-sane.c index a8efc7a..5d9ec99 100644 --- a/backend/canon-sane.c +++ b/backend/canon-sane.c @@ -1126,7 +1126,7 @@ sane_start (SANE_Handle handle) if (thistmpfile != NULL) { if (mktemp(thistmpfile) == 0) - { + { DBG(1, "mktemp(thistmpfile) is failed\n"); return (SANE_STATUS_INVAL); } -- 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/canon-sane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/canon-sane.c') diff --git a/backend/canon-sane.c b/backend/canon-sane.c index 5d9ec99..cd75719 100644 --- a/backend/canon-sane.c +++ b/backend/canon-sane.c @@ -1125,9 +1125,9 @@ sane_start (SANE_Handle handle) if (thistmpfile != NULL) { - if (mktemp(thistmpfile) == 0) + if (!mkstemp(thistmpfile)) { - DBG(1, "mktemp(thistmpfile) is failed\n"); + DBG(1, "mkstemp(thistmpfile) is failed\n"); return (SANE_STATUS_INVAL); } } -- cgit v1.2.3