mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

unused and reassigned values fixes

merge-requests/1/head
Stphane Voltz 2013-03-05 07:21:26 +01:00
rodzic b3f01a9010
commit 9e47eb4a37
1 zmienionych plików z 4 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
sanei/sanei_usb.c
Wyświetl plik

@ -1484,8 +1484,6 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK; endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK;
DBG (5, "sanei_usb_open: direction: %d\n", direction); DBG (5, "sanei_usb_open: direction: %d\n", direction);
transfer_type =
endpoint->bmAttributes & USB_ENDPOINT_TYPE_MASK;
DBG (5, DBG (5,
"sanei_usb_open: address: %d transfertype: %d\n", "sanei_usb_open: address: %d transfertype: %d\n",
@ -1917,7 +1915,9 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
} }
else if (devices[devcount].method == sanei_usb_method_scanner_driver) else if (devices[devcount].method == sanei_usb_method_scanner_driver)
{ {
#ifdef FD_CLOEXEC
long int flag; long int flag;
#endif
/* Using kernel scanner driver */ /* Using kernel scanner driver */
devices[devcount].fd = -1; devices[devcount].fd = -1;
#ifdef HAVE_RESMGR #ifdef HAVE_RESMGR
@ -1965,7 +1965,7 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
ulBufLen = sizeof(ucData); ulBufLen = sizeof(ucData);
memset(&ucData,0,sizeof(ucData)); memset(&ucData,0,sizeof(ucData));
int result, num,rc; int result, rc;
int address, direction, transfer_type; int address, direction, transfer_type;
DBG (5, "devname = %s, devcount = %d\n",devices[devcount].devname,devcount); DBG (5, "devname = %s, devcount = %d\n",devices[devcount].devname,devcount);
@ -2010,11 +2010,9 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
DBG (1, "sanei_usb_open: UsbDeviceSetConfiguration rc = %d\n",result); DBG (1, "sanei_usb_open: UsbDeviceSetConfiguration rc = %d\n",result);
if (result) if (result)
{ {
SANE_Status status = SANE_STATUS_INVAL;
DBG (1, "sanei_usb_open: usbcalls complained on UsbDeviceSetConfiguration, rc= %d\n", result); DBG (1, "sanei_usb_open: usbcalls complained on UsbDeviceSetConfiguration, rc= %d\n", result);
status = SANE_STATUS_ACCESS_DENIED;
UsbClose (dh); UsbClose (dh);
return status; return SANE_STATUS_ACCESS_DENIED;
} }
/* Now we look for usable endpoints */ /* Now we look for usable endpoints */