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

Do not refresh option descriptors cache behind the frontend's back.

merge-requests/1/head
Julien BLACHE 2008-06-24 17:29:37 +00:00
rodzic 83365608d3
commit f7f53e0479
2 zmienionych plików z 8 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2008-06-24 Julien Blache <jb@jblache.org>
* backend/net.c: do not reload options behind the frontend's back
in sane_control_option; rather return SANE_STATUS_INVAL and warn
that the frontend is buggy.
2008-06-22 Julien Blache <jb@jblache.org> 2008-06-22 Julien Blache <jb@jblache.org>
* frontend/saned.c: terminate child processes before exiting in * frontend/saned.c: terminate child processes before exiting in
debug mode. debug mode.

12
backend/net.c
Wyświetl plik

@ -1691,16 +1691,10 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
if (!s->options_valid) if (!s->options_valid)
{ {
DBG (3, "sane_control_option: getting option descriptors\n"); DBG (1, "sane_control_option: FRONTEND BUG: option descriptors reload needed\n");
status = fetch_options (s); return SANE_STATUS_INVAL;
if (status != SANE_STATUS_GOOD) }
{
DBG (1, "sane_control_option: fetch_options failed (%s)\n",
sane_strstatus (status));
return status;
}
}
if (((SANE_Word) option >= s->opt.num_options) || (option < 0)) if (((SANE_Word) option >= s->opt.num_options) || (option < 0))
{ {
DBG (1, "sane_control_option: invalid option number\n"); DBG (1, "sane_control_option: invalid option number\n");