aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Meeuwissen <paddy-hack@member.fsf.org>2016-09-25 15:53:46 +0900
committerOlaf Meeuwissen <paddy-hack@member.fsf.org>2016-09-25 15:53:46 +0900
commit7d7030a40986d97d3cf7a5313bf889bce4af8131 (patch)
treee7cc6be70c3ffc58bffe59139426cdc3600805e1
parente6faafcdc94e253f7f4fe793fec6110ce37e8014 (diff)
sanei_usb: : fix [-Wunused-parameter] compiler warnings
These were issued in the absence of libusb.
-rw-r--r--sanei/sanei_usb.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
index ea39e36..61d5cb8 100644
--- a/sanei/sanei_usb.c
+++ b/sanei/sanei_usb.c
@@ -2174,7 +2174,7 @@ sanei_usb_close (SANE_Int dn)
}
void
-sanei_usb_set_timeout (SANE_Int timeout)
+sanei_usb_set_timeout (SANE_Int __sane_unused__ timeout)
{
#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
libusb_timeout = timeout;
@@ -2186,7 +2186,6 @@ sanei_usb_set_timeout (SANE_Int timeout)
SANE_Status
sanei_usb_clear_halt (SANE_Int dn)
{
- int ret;
char *env;
int workaround = 0;
@@ -2205,6 +2204,7 @@ sanei_usb_clear_halt (SANE_Int dn)
}
#ifdef HAVE_LIBUSB_LEGACY
+ int ret;
/* This call seems to be required by Linux xhci driver
* even though it should be a no-op. Without it, the
@@ -2228,6 +2228,7 @@ sanei_usb_clear_halt (SANE_Int dn)
}
#elif defined(HAVE_LIBUSB)
+ int ret;
/* This call seems to be required by Linux xhci driver
* even though it should be a no-op. Without it, the
@@ -2257,7 +2258,7 @@ sanei_usb_clear_halt (SANE_Int dn)
}
SANE_Status
-sanei_usb_reset (SANE_Int dn)
+sanei_usb_reset (SANE_Int __sane_unused__ dn)
{
#ifdef HAVE_LIBUSB_LEGACY
int ret;
@@ -3129,7 +3130,9 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate)
}
extern SANE_Status
-sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc )
+sanei_usb_get_descriptor( SANE_Int dn,
+ struct sanei_usb_dev_descriptor __sane_unused__
+ *desc )
{
if (dn >= device_number || dn < 0)
{