97 lines
3.1 KiB
Diff
97 lines
3.1 KiB
Diff
diff -up sane-backends-1.0.19/backend/epjitsu.c.uninitialized sane-backends-1.0.19/backend/epjitsu.c
|
|
--- sane-backends-1.0.19/backend/epjitsu.c.uninitialized 2007-12-30 02:31:13.000000000 +0100
|
|
+++ sane-backends-1.0.19/backend/epjitsu.c 2008-02-14 19:31:38.000000000 +0100
|
|
@@ -210,7 +210,6 @@ sane_init (SANE_Int * version_code, SANE
|
|
struct scanner *dev;
|
|
char line[PATH_MAX];
|
|
const char *lp;
|
|
- size_t len;
|
|
|
|
authorize = authorize; /* get rid of compiler warning */
|
|
|
|
@@ -233,17 +232,12 @@ sane_init (SANE_Int * version_code, SANE
|
|
|
|
while (sanei_config_read (line, PATH_MAX, fp)) {
|
|
|
|
+ lp = line;
|
|
+
|
|
/* ignore comments */
|
|
- if (line[0] == '#')
|
|
+ if (*lp == '#')
|
|
continue;
|
|
|
|
- /* delete newline characters at end */
|
|
- len = strlen (line);
|
|
- if (line[len - 1] == '\n')
|
|
- line[--len] = '\0';
|
|
-
|
|
- lp = sanei_config_skip_whitespace (line);
|
|
-
|
|
/* skip empty lines */
|
|
if (*lp == 0)
|
|
continue;
|
|
diff -up sane-backends-1.0.19/backend/fujitsu.c.uninitialized sane-backends-1.0.19/backend/fujitsu.c
|
|
--- sane-backends-1.0.19/backend/fujitsu.c.uninitialized 2008-01-23 02:21:21.000000000 +0100
|
|
+++ sane-backends-1.0.19/backend/fujitsu.c 2008-02-14 19:31:38.000000000 +0100
|
|
@@ -480,7 +480,6 @@ find_scanners ()
|
|
struct fujitsu *dev;
|
|
char line[PATH_MAX];
|
|
const char *lp;
|
|
- size_t len;
|
|
FILE *fp;
|
|
int num_devices=0;
|
|
int i=0;
|
|
@@ -498,17 +497,12 @@ find_scanners ()
|
|
|
|
while (sanei_config_read (line, PATH_MAX, fp)) {
|
|
|
|
+ lp = line;
|
|
+
|
|
/* ignore comments */
|
|
- if (line[0] == '#')
|
|
+ if (*lp == '#')
|
|
continue;
|
|
|
|
- /* delete newline characters at end */
|
|
- len = strlen (line);
|
|
- if (line[len - 1] == '\n')
|
|
- line[--len] = '\0';
|
|
-
|
|
- lp = sanei_config_skip_whitespace (line);
|
|
-
|
|
/* skip empty lines */
|
|
if (*lp == 0)
|
|
continue;
|
|
diff -up sane-backends-1.0.19/backend/cardscan.c.uninitialized sane-backends-1.0.19/backend/cardscan.c
|
|
--- sane-backends-1.0.19/backend/cardscan.c.uninitialized 2007-10-26 16:56:37.000000000 +0200
|
|
+++ sane-backends-1.0.19/backend/cardscan.c 2008-02-14 19:31:38.000000000 +0100
|
|
@@ -320,7 +320,6 @@ sane_get_devices (const SANE_Device ***
|
|
struct scanner *dev;
|
|
char line[PATH_MAX];
|
|
const char *lp;
|
|
- size_t len;
|
|
FILE *fp;
|
|
int num_devices=0;
|
|
int i=0;
|
|
@@ -337,17 +336,12 @@ sane_get_devices (const SANE_Device ***
|
|
|
|
while (sanei_config_read (line, PATH_MAX, fp)) {
|
|
|
|
+ lp = line;
|
|
+
|
|
/* ignore comments */
|
|
- if (line[0] == '#')
|
|
+ if (*lp == '#')
|
|
continue;
|
|
|
|
- /* delete newline characters at end */
|
|
- len = strlen (line);
|
|
- if (line[len - 1] == '\n')
|
|
- line[--len] = '\0';
|
|
-
|
|
- lp = sanei_config_skip_whitespace (line);
|
|
-
|
|
/* skip empty lines */
|
|
if (*lp == 0)
|
|
continue;
|