pixma: Log unsupported scanner type in BJNP and AXIS

pixma-axis-driver^2
Ondrej Zary 2020-07-31 13:47:58 +02:00
rodzic 18ddb14b1f
commit d651e44192
3 zmienionych plików z 14 dodań i 5 usunięć

Wyświetl plik

@ -491,7 +491,16 @@ add_scanner(int udp_socket, const char *uri,
if (status == 1)
snprintf(serial, sizeof(serial), "%s BUSY %s", inet_ntoa(addr.sin_addr), user);
device[axis_no_devices++].addr = addr.sin_addr;
attach_axis(uri, devname, serial, pixma_devices);
switch (attach_axis(uri, devname, serial, pixma_devices))
{
case SANE_STATUS_GOOD:
break;
case SANE_STATUS_INVAL:
DBG(LOG_CRIT, "add_scanner: Scanner %s is not supported, model is unknown! Please report upstream\n", devname);
break;
default:
DBG(LOG_CRIT, "add_scanner: unexpected error (out of memory?)\n");
}
}
return 0;

Wyświetl plik

@ -1845,6 +1845,9 @@ static void add_scanner(SANE_Int *dev_no,
PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner added: %s, serial %s, mac address: %s.\n",
uri, serial, device[*dev_no].mac_address));
break;
case SANE_STATUS_INVAL:
PDBG (bjnp_dbg (LOG_CRIT, "add_scanner: Scanner %s is not supported, model is unknown! Please report upstream\n", makemodel));
break;
default:
PDBG (bjnp_dbg (LOG_CRIT, "add_scanner: unexpected error (out of memory?), adding %s\n", makemodel));
}

Wyświetl plik

@ -178,10 +178,7 @@ attach_net (SANE_String_Const devname, SANE_String_Const makemodel,
if (!si->devname)
return SANE_STATUS_NO_MEM;
if ((cfg = lookup_scanner(makemodel, pixma_devices)) == (struct pixma_config_t *)NULL)
{
pixma_dbg (0, "attach_net: Scanner %s is not supported, model is unknown! Please report upstream\n", makemodel);
error = SANE_STATUS_INVAL;
}
error = SANE_STATUS_INVAL;
else
{
si->cfg = cfg;