diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-09-09 08:47:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-09-09 08:47:12 +0200 |
| commit | 311a42d3c545f079f8a9428c52fbdc73731bdc37 (patch) | |
| tree | d41dcf944b969257cd5ed62ccb7166305015a642 /debian/patches/0100-xcam.c_dead_code.patch | |
| parent | 4a8a70149879404d36ccd39c5983e3a9760af07e (diff) | |
| parent | 16a4948c7243ab0e228780b3a2b9aea97900f32a (diff) | |
Merge branch 'release/debian/1.0.14-13'debian/1.0.14-13
Diffstat (limited to 'debian/patches/0100-xcam.c_dead_code.patch')
| -rw-r--r-- | debian/patches/0100-xcam.c_dead_code.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/0100-xcam.c_dead_code.patch b/debian/patches/0100-xcam.c_dead_code.patch new file mode 100644 index 0000000..f90bc6b --- /dev/null +++ b/debian/patches/0100-xcam.c_dead_code.patch @@ -0,0 +1,25 @@ +Author: <jblache@debian.org> +Description: Remove dead code in src/xcam.c::load_defaults() +Index: trunk/src/xcam.c +=================================================================== +--- trunk.orig/src/xcam.c ++++ trunk/src/xcam.c +@@ -536,16 +536,14 @@ static void + load_defaults (int silent) + { + char filename[PATH_MAX]; +- int fd; + + DBG (DBG_debug, "xcam, load_defaults: enter\n"); + if (make_default_filename (sizeof (filename), filename, dialog->dev_name) + < 0) + return; +- if (fd < 0) +- return; ++ + load_settings (filename, silent); +- sanei_load_values (fd, dialog->dev); ++ + DBG (DBG_debug, "xcam, load_defaults: exit\n"); + } + |