blob: 41a33e0d1438be5db3e6e30503b800612b0e58e7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_xcam.c_dead_code.dpatch by <jblache@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove dead code in src/xcam.c::load_defaults()
@DPATCH@
diff -urNad sane-frontends-1.0.14~/src/xcam.c sane-frontends-1.0.14/src/xcam.c
--- sane-frontends-1.0.14~/src/xcam.c 2005-09-20 19:30:01.000000000 +0200
+++ sane-frontends-1.0.14/src/xcam.c 2005-09-20 19:30:59.289245755 +0200
@@ -536,16 +536,14 @@
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");
}
|
