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

fix ifs

merge-requests/569/head
Benoit JUIN 2023-12-03 06:14:03 +01:00
rodzic f7dd8e224d
commit 068714ef6e
1 zmienionych plików z 11 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
backend/lexmark_x2600.c
Wyświetl plik

@ -672,8 +672,8 @@ sane_get_devices (const SANE_Device ***device_list, SANE_Bool local_only)
SANE_Int index; SANE_Int index;
Lexmark_Device *lexmark_device; Lexmark_Device *lexmark_device;
DBG (2, "sane_get_devices: device_list=%p, local_only=%d\n", DBG (2, "sane_get_devices: device_list=%p, local_only=%d num_devices=%d\n",
(void *) device_list, local_only); (void *) device_list, local_only, num_devices);
sanei_usb_scan_devices (); sanei_usb_scan_devices ();
@ -1015,30 +1015,31 @@ sane_start (SANE_Handle handle)
//launch scan commands //launch scan commands
status = usb_write_then_read(lexmark_device, command1_block, status = usb_write_then_read(lexmark_device, command1_block,
command1_block_size); command1_block_size);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD){
free(cmd); free(cmd);
return status; return status;
}
status = usb_write_then_read(lexmark_device, command2_block, status = usb_write_then_read(lexmark_device, command2_block,
command2_block_size); command2_block_size);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD){
free(cmd); free(cmd);
return status; return status;
}
build_packet(lexmark_device, 0x05, cmd); build_packet(lexmark_device, 0x05, cmd);
status = usb_write_then_read(lexmark_device, cmd, status = usb_write_then_read(lexmark_device, cmd,
command_with_params_block_size); command_with_params_block_size);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD){
free(cmd); free(cmd);
return status; return status;
}
build_packet(lexmark_device, 0x01, cmd);; build_packet(lexmark_device, 0x01, cmd);;
status = usb_write_then_read(lexmark_device, cmd, status = usb_write_then_read(lexmark_device, cmd,
command_with_params_block_size); command_with_params_block_size);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD){
free(cmd); free(cmd);
return status; return status;
}
free(cmd); free(cmd);
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;
} }