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

Fix function proto.

merge-requests/213/head^2
Thierry HUCHARD 2020-03-16 00:01:58 +01:00
rodzic 54136b8deb
commit 0440234c36
3 zmienionych plików z 9 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
backend/escl/escl.c
Wyświetl plik

@ -567,7 +567,7 @@ sane_open(SANE_String_Const name, SANE_Handle *h)
if (name == NULL) if (name == NULL)
return (SANE_STATUS_INVAL); return (SANE_STATUS_INVAL);
status = escl_status(name); status = escl_status(name, PLATEN);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
return (status); return (status);
handler = (escl_sane_t *)calloc(1, sizeof(escl_sane_t)); handler = (escl_sane_t *)calloc(1, sizeof(escl_sane_t));
@ -852,7 +852,10 @@ sane_start(SANE_Handle h)
handler->ps.lines = he; handler->ps.lines = he;
handler->ps.bytes_per_line = w * bps; handler->ps.bytes_per_line = w * bps;
if (handler->scanner->source != PLATEN) { if (handler->scanner->source != PLATEN) {
SANE_Bool next_page = (SANE_STATUS_GOOD == escl_status(handler->name) ? SANE_TRUE : SANE_FALSE); SANE_Bool next_page =
(SANE_STATUS_GOOD == escl_status(handler->name, handler->scanner->source) ?
SANE_TRUE :
SANE_FALSE);
handler->scanner->work == next_page; handler->scanner->work == next_page;
handler->ps.last_frame = next_page; handler->ps.last_frame = next_page;
} }

2
backend/escl/escl.h
Wyświetl plik

@ -179,7 +179,7 @@ enum
ESCL_Device *escl_devices(SANE_Status *status); ESCL_Device *escl_devices(SANE_Status *status);
SANE_Status escl_device_add(int port_nb, const char *model_name, SANE_Status escl_device_add(int port_nb, const char *model_name,
char *ip_address, char *type); char *ip_address, char *type);
SANE_Status escl_status(SANE_String_Const name); SANE_Status escl_status(SANE_String_Const name, int source);
capabilities_t *escl_capabilities(SANE_String_Const name, SANE_Status *status); capabilities_t *escl_capabilities(SANE_String_Const name, SANE_Status *status);
char *escl_newjob(capabilities_t *scanner, SANE_String_Const name, char *escl_newjob(capabilities_t *scanner, SANE_String_Const name,
SANE_Status *status); SANE_Status *status);

6
backend/escl/escl_status.c
Wyświetl plik

@ -133,7 +133,7 @@ print_xml_s(xmlNode *node, SANE_Status *status)
if (platen_status != SANE_STATUS_GOOD && if (platen_status != SANE_STATUS_GOOD &&
platen_status != SANE_STATUS_UNSUPPORTED) { platen_status != SANE_STATUS_UNSUPPORTED) {
*status = platen_status; *status = platen_status;
} else if (dev->opt.src == OPT_SOURCE_PLATEN) { } else if (source == PLATEN) {
*status = platen_status; *status = platen_status;
} else { } else {
*status = adf_status; *status = adf_status;
@ -149,7 +149,7 @@ print_xml_s(xmlNode *node, SANE_Status *status)
* \return status (if everything is OK, status = SANE_STATUS_GOOD, otherwise, SANE_STATUS_NO_MEM/SANE_STATUS_INVAL) * \return status (if everything is OK, status = SANE_STATUS_GOOD, otherwise, SANE_STATUS_NO_MEM/SANE_STATUS_INVAL)
*/ */
SANE_Status SANE_Status
escl_status(SANE_String_Const name) escl_status(SANE_String_Const name, int source)
{ {
SANE_Status status; SANE_Status status;
CURL *curl_handle = NULL; CURL *curl_handle = NULL;
@ -194,7 +194,7 @@ escl_status(SANE_String_Const name)
goto clean; goto clean;
} }
status = SANE_STATUS_DEVICE_BUSY; status = SANE_STATUS_DEVICE_BUSY;
print_xml_s(node, &status); print_xml_s(node, &status, source);
clean: clean:
xmlFreeDoc(data); xmlFreeDoc(data);
clean_data: clean_data: