diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-19 17:46:16 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-09-19 17:46:16 +0200 |
commit | d1449f66bb265d3fcc891862b2afc90118a4f4f7 (patch) | |
tree | 1c2e9fecb1ffc8a7fc1d9ebee5842178bde66df3 /debian/patches/0170-return_empty_list_when_local_devices_requested.patch | |
parent | ee2d7f5d79e2c92cb3aa825e89c1cc92becd062f (diff) |
New d/p/0170-return_empty_list_when_local_devices_requested.patch; fir typos
Diffstat (limited to 'debian/patches/0170-return_empty_list_when_local_devices_requested.patch')
-rw-r--r-- | debian/patches/0170-return_empty_list_when_local_devices_requested.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/debian/patches/0170-return_empty_list_when_local_devices_requested.patch b/debian/patches/0170-return_empty_list_when_local_devices_requested.patch new file mode 100644 index 0000000..5d0ba04 --- /dev/null +++ b/debian/patches/0170-return_empty_list_when_local_devices_requested.patch @@ -0,0 +1,43 @@ +Description: eturn_empty_list_when_local_devices_requested +Author: Barnabás Pőcze <pobrn@protonmail.com> +Origin: backport, https://gitlab.com/sane-project/backends/-/commit/c946aa5a84297f33b30cddb0c89fcf375ed65d10 +Bug: https://gitlab.com/sane-project/backends/-/merge_requests/506 +Forwarded: not-needed +Last-Update: 2020-09-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/backend/dell1600n_net.c +=================================================================== +--- trunk.orig/backend/dell1600n_net.c ++++ trunk/backend/dell1600n_net.c +@@ -233,6 +233,9 @@ static void JpegDecompTermSource (j_deco + /* Results of last call to sane_get_devices */ + static struct DeviceRecord *gKnownDevices[MAX_SCANNERS]; + ++/* Empty list for when network devices are not wanted */ ++static const SANE_Device *gEmptyDeviceList[1]; ++ + /* Array of open scanner device states. + :NOTE: (int)SANE_Handle is an offset into this array */ + static struct ScannerState *gOpenScanners[MAX_SCANNERS]; +@@ -306,15 +309,17 @@ sane_get_devices (const SANE_Device *** + const char *pVal; + int valLen; + ++ if (local_only) { ++ *device_list = gEmptyDeviceList; ++ return SANE_STATUS_GOOD; ++ } ++ + /* init variables */ + ret = SANE_STATUS_GOOD; + sock = 0; + pDevice = NULL; + optYes = 1; + +- if (local_only) +- return ret; +- + InitComBuf (&queryPacket); + + /* clear previous results */ |