Merge branch 'epjitsu-backend-generates-compiler-warning-in-debian-10' into 'master'

Resolve "epjitsu backend generates compiler warning in Debian 10"

Closes #193

See merge request sane-project/backends!267
merge-requests/284/merge
Olaf Meeuwissen 2019-12-26 10:27:47 +00:00
commit d190c559c2
1 zmienionych plików z 12 dodań i 1 usunięć

Wyświetl plik

@ -349,10 +349,21 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
continue;
if ((strncmp ("firmware", lp, 8) == 0) && isspace (lp[8])) {
size_t firmware_len;
lp += 8;
lp = sanei_config_skip_whitespace (lp);
DBG (15, "sane_get_devices: firmware '%s'\n", lp);
strncpy((char *)global_firmware_filename,lp,PATH_MAX);
firmware_len = strlen(lp);
if (firmware_len > sizeof(global_firmware_filename) - 1)
{
DBG (5, "sane_get_devices: firmware file too long. ignoring '%s'\n", lp);
}
else
{
strcpy((char *)global_firmware_filename, lp);
}
}
else if ((strncmp ("usb", lp, 3) == 0) && isspace (lp[3])) {
DBG (15, "sane_get_devices: looking for '%s'\n", lp);