kopia lustrzana https://gitlab.com/sane-project/backends
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!267merge-requests/213/head
commit
d190c559c2
|
@ -349,10 +349,21 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ((strncmp ("firmware", lp, 8) == 0) && isspace (lp[8])) {
|
if ((strncmp ("firmware", lp, 8) == 0) && isspace (lp[8])) {
|
||||||
|
size_t firmware_len;
|
||||||
|
|
||||||
lp += 8;
|
lp += 8;
|
||||||
lp = sanei_config_skip_whitespace (lp);
|
lp = sanei_config_skip_whitespace (lp);
|
||||||
DBG (15, "sane_get_devices: firmware '%s'\n", 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])) {
|
else if ((strncmp ("usb", lp, 3) == 0) && isspace (lp[3])) {
|
||||||
DBG (15, "sane_get_devices: looking for '%s'\n", lp);
|
DBG (15, "sane_get_devices: looking for '%s'\n", lp);
|
||||||
|
|
Ładowanie…
Reference in New Issue