summaryrefslogtreecommitdiff
path: root/debian/patches/kodakaio.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-13 07:21:57 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-10-13 07:21:57 +0200
commitbc7bfb103acda936bd145f2d90e292a5fe0460d2 (patch)
tree8f74d634be11840fd3f526e5fd48d94abbd7c26a /debian/patches/kodakaio.patch
parent90ad29d4f6fc7011a538a339bf3d4f9260899a80 (diff)
Rename & reorder patches
Diffstat (limited to 'debian/patches/kodakaio.patch')
-rw-r--r--debian/patches/kodakaio.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/debian/patches/kodakaio.patch b/debian/patches/kodakaio.patch
deleted file mode 100644
index f413a00..0000000
--- a/debian/patches/kodakaio.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Backport of bug fix for kodakaio driver
- The kodakaio driver in 1.0.24 blows up due to a null pointer
- dereference when scanning for devices if it doesn't find a
- device. This is a backport of the fix from 1.0.25git.
-Author: Paul Newall <quandry@ntlworld.com>
-
---- a/backend/kodakaio.c
-+++ b/backend/kodakaio.c
-@@ -2184,6 +2184,7 @@
- AvahiLookupResultFlags flags,
- AVAHI_GCC_UNUSED void* userdata) {
-
-+ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
- char *pidkey, *pidvalue;
- char *vidkey, *vidvalue;
- size_t valuesize;
-@@ -2204,17 +2205,37 @@
- avahi_address_snprint(a, sizeof(a), address);
-
- /* Output short for Kodak ESP */
-- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name);
-- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"),
-- &vidkey, &vidvalue, &valuesize);
-- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue);
-- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"),
-- &pidkey, &pidvalue, &valuesize);
-- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name);
-
-+ vid_pair_list = avahi_string_list_find(txt, "vid");
-+ if(vid_pair_list != NULL) {
-+ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
-+ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue);
-+ }
-+ else DBG(min(10,DBG_AUTO), "failed to find key vid\n");
-+
-+ pid_pair_list = avahi_string_list_find(txt, "pid");
-+ if(pid_pair_list != NULL) {
-+ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
-+ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+ }
-+ else DBG(min(10,DBG_AUTO), "failed to find key pid\n");
-+
-+ if(pid_pair_list != NULL && vid_pair_list != NULL) {
- ProcessAvahiDevice(name, vidvalue, pidvalue, a);
-- avahi_free(vidkey); avahi_free(vidvalue);
-- avahi_free(pidkey); avahi_free(pidvalue);
-+ }
-+ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
-+
-+ if(vid_pair_list != NULL) {
-+ avahi_free(vidkey);
-+ avahi_free(vidvalue);
-+ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
-+ }
-+ if(pid_pair_list != NULL) {
-+ avahi_free(pidkey);
-+ avahi_free(pidvalue);
-+ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
-+ }
- }
- }
-