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

pieusb: Add missing calls to sanei_pieusb_convert_status() 

Fix cases where values of type PIEUSB_Status were used or returned when
the expected type was SANE_Status.
merge-requests/701/head
David Ward 2022-03-08 19:00:00 -05:00
rodzic f8785fb6a8
commit e859ea4d89
2 zmienionych plików z 5 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
backend/pieusb_scancmd.c
Wyświetl plik

@ -205,7 +205,8 @@ sanei_pieusb_cmd_test_unit_ready(SANE_Int device_number, struct Pieusb_Command_S
status->pieusb_status = sanei_pieusb_command (device_number, command, NULL, 0);
DBG (DBG_info_scan, "sanei_pieusb_cmd_test_unit_ready() return status = %s\n", sane_strstatus(status->pieusb_status));
DBG (DBG_info_scan, "sanei_pieusb_cmd_test_unit_ready() return status = %s\n",
sane_strstatus (sanei_pieusb_convert_status (status->pieusb_status)));
}
/**

6
backend/pieusb_specific.c
Wyświetl plik

@ -260,7 +260,7 @@ sanei_pieusb_find_device_callback (const char *devicename)
free (dev);
DBG (DBG_error, "sanei_pieusb_find_device_callback: get scanner properties (5 bytes) failed with %d\n", status.pieusb_status);
sanei_usb_close (device_number);
return status.pieusb_status;
return sanei_pieusb_convert_status (status.pieusb_status);
}
/* get full inquiry data */
sanei_pieusb_cmd_inquiry(device_number, &inq, inq.additionalLength+4, &status);
@ -268,7 +268,7 @@ sanei_pieusb_find_device_callback (const char *devicename)
free (dev);
DBG (DBG_error, "sanei_pieusb_find_device_callback: get scanner properties failed\n");
sanei_usb_close (device_number);
return status.pieusb_status;
return sanei_pieusb_convert_status (status.pieusb_status);
}
/* Close the device again */
@ -1781,7 +1781,7 @@ sanei_pieusb_set_frame_from_options(Pieusb_Scanner * scanner)
scanner->frame.index = 0x80; /* 0x80: value from cyberview */
sanei_pieusb_cmd_set_scan_frame (scanner->device_number, scanner->frame.index, &(scanner->frame), &status);
DBG (DBG_info_sane, "sanei_pieusb_set_frame_from_options(): sanei_pieusb_cmd_set_scan_frame status %s\n", sane_strstatus (sanei_pieusb_convert_status (status.pieusb_status)));
return status.pieusb_status;
return sanei_pieusb_convert_status (status.pieusb_status);
}
/*