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

Explicitely initialize vendorID and productID. 

Henning Meier-Geinitz <henning@meier-geinitz.de>
DEVEL_2_0_BRANCH-1
Henning Geinitz 2002-05-30 19:23:22 +00:00
rodzic fa0a922861
commit a1df2d83f5
1 zmienionych plików z 6 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
sanei/sanei_usb.c
Wyświetl plik

@ -139,37 +139,27 @@ SANE_Status
sanei_usb_get_vendor_product (SANE_Int fd, SANE_Word * vendor, sanei_usb_get_vendor_product (SANE_Int fd, SANE_Word * vendor,
SANE_Word * product) SANE_Word * product)
{ {
SANE_Word vendorID, productID; SANE_Word vendorID = 0;
SANE_Word productID = 0;
#if defined (__linux__) #if defined (__linux__)
/* read the vendor and product IDs via the IOCTLs */ /* read the vendor and product IDs via the IOCTLs */
if (ioctl (fd, SCANNER_IOCTL_VENDOR , &vendorID) == -1) if (ioctl (fd, SCANNER_IOCTL_VENDOR , &vendorID) == -1)
{ {
if (ioctl (fd, SCANNER_IOCTL_VENDOR_OLD , &vendorID) == -1) if (ioctl (fd, SCANNER_IOCTL_VENDOR_OLD , &vendorID) == -1)
{ DBG (3, "sanei_usb_get_vendor_product: ioctl (vendor) of fd %d "
DBG (3, "sanei_usb_get_vendor_product: ioctl (vendor) of fd %d " "failed: %s\n", fd, strerror (errno));
"failed: %s\n", fd, strerror (errno));
/* just set the vendor ID to 0 */
vendorID = 0;
}
} }
if (ioctl (fd, SCANNER_IOCTL_PRODUCT , &productID) == -1) if (ioctl (fd, SCANNER_IOCTL_PRODUCT , &productID) == -1)
{ {
if (ioctl (fd, SCANNER_IOCTL_PRODUCT_OLD , &productID) == -1) if (ioctl (fd, SCANNER_IOCTL_PRODUCT_OLD , &productID) == -1)
{ DBG (3, "sanei_usb_get_vendor_product: ioctl (product) of fd %d "
DBG (3, "sanei_usb_get_vendor_product: ioctl (product) of fd %d " "failed: %s\n", fd, strerror (errno));
"failed: %s\n", fd, strerror (errno));
/* just set the product ID to 0 */
productID = 0;
}
} }
if (vendor) if (vendor)
*vendor = vendorID; *vendor = vendorID;
if (product) if (product)
*product = productID; *product = productID;
#else /* not defined (__linux__) */
vendorID = 0;
productID = 0;
#endif /* not defined (__linux__) */ #endif /* not defined (__linux__) */
if (!vendorID || !productID) if (!vendorID || !productID)