Merge branch 'artec-backend-produces-compiler-warnings-on-debian-10' into 'master'

Resolve "artec backend produces compiler warnings on Debian 10"

Closes #191

See merge request sane-project/backends!265
merge-requests/266/merge
Olaf Meeuwissen 2019-12-24 09:01:13 +00:00
commit c77f89de62
1 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -1999,8 +1999,8 @@ attach (const char *devname, ARTEC_Device ** devp)
DBG (6, "Found BlackWidow BW4800SP scanner, setting up like AT3\n");
/* setup the vendor and product to mimic the Artec/Ultima AT3 */
strncpy (result + 8, "ULTIMA", 6);
strncpy (result + 16, "AT3 ", 16);
memcpy (result + 8, "ULTIMA", 6);
memcpy (result + 16, "AT3 ", 16);
}
/*
@ -2013,8 +2013,8 @@ attach (const char *devname, ARTEC_Device ** devp)
DBG (6, "Found Plustek 19200S scanner, setting up like AM12S\n");
/* setup the vendor and product to mimic the Artec/Ultima AM12S */
strncpy (result + 8, "ULTIMA", 6);
strncpy (result + 16, "AM12S ", 16);
memcpy (result + 8, "ULTIMA", 6);
memcpy (result + 16, "AM12S ", 16);
}
/*