summaryrefslogtreecommitdiff
path: root/backend/sm3600.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-24 21:03:56 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-24 21:03:56 +0200
commit58912f68c2489bcee787599837447e0d64dfd61a (patch)
treedda50aadde35fe152da1a8d50769987ace0f1496 /backend/sm3600.c
parentcfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff)
New upstream version 1.0.27upstream/1.0.27
Diffstat (limited to 'backend/sm3600.c')
-rw-r--r--backend/sm3600.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/backend/sm3600.c b/backend/sm3600.c
index dd1f31f..908e8be 100644
--- a/backend/sm3600.c
+++ b/backend/sm3600.c
@@ -73,7 +73,7 @@ Start: 2.4.2001
#include "../include/sane/saneopts.h"
#include "../include/sane/sanei_usb.h"
-#undef HAVE_LIBUSB
+#undef HAVE_LIBUSB_LEGACY
/* prevent inclusion of scantool.h */
#define SCANTOOL_H
@@ -431,13 +431,11 @@ sane_exit (void)
SANE_Status
sane_get_devices (const SANE_Device *** device_list,
- SANE_Bool local_only)
+ SANE_Bool __sane_unused__ local_only)
{
TDevice *dev;
int i;
- local_only = TRUE; /* Avoid compile warning */
-
if (devlist) free (devlist);
devlist = malloc ((num_devices + 1) * sizeof (devlist[0]));
@@ -458,7 +456,6 @@ sane_open (SANE_String_Const devicename, SANE_Handle *handle)
{
TDevice *pdev;
TInstance *this;
- SANE_Status rc;
DBG(DEBUG_VERBOSE,"opening %s\n",devicename);
if (devicename[0]) /* selected */
{
@@ -488,8 +485,6 @@ DBG(DEBUG_VERBOSE,"%s<>%s\n",devicename, pdev->sane.name);
if (sanei_usb_open (devicename, &this->hScanner) != SANE_STATUS_GOOD)
return SetError (this, SANE_STATUS_IO_ERROR, "cannot open scanner device");
- rc = SANE_STATUS_GOOD;
-
this->quality=fast;
return InitOptions(this);
}