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

Merge branch 'escl-reduces-number-entries-offer' into 'master' 

Escl reduces number entries offer

See merge request sane-project/backends!432
merge-requests/463/merge
Ordissimo 2020-05-06 14:44:24 +00:00
rodzic 050e73d07e fc14edf69e
commit 20f7026371
1 zmienionych plików z 17 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -155,9 +155,23 @@ escl_device_add(int port_nb, const char *model_name, char *ip_address, char *typ
ESCL_Device *current = NULL;
DBG (10, "escl_device_add\n");
for (current = list_devices_primary; current; current = current->next) {
if (strcmp(current->ip_address, ip_address) == 0 && current->port_nb == port_nb
&& strcmp(current->type, type) == 0)
return (SANE_STATUS_GOOD);
if (strcmp(current->ip_address, ip_address) == 0)
{
if (strcmp(current->type, type))
{
if(!strcmp(type, "_uscans._tcp") ||
!strcmp(type, "https"))
{
free (current->type);
current->type = strdup(type);
current->port_nb = port_nb;
current->https = SANE_TRUE;
}
return (SANE_STATUS_GOOD);
}
else if (current->port_nb == port_nb)
return (SANE_STATUS_GOOD);
}
}
current = (ESCL_Device*)calloc(1, sizeof(*current));
if (current == NULL) {