projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.5.2p1
[debian/amanda]
/
server-src
/
infofile.c
diff --git
a/server-src/infofile.c
b/server-src/infofile.c
index 32f86f4123c3dbd69087ee058b3de8a9f7d7d762..6ceca7ef5f39e71bb2eec71a68c2ba71f1944dc1 100644
(file)
--- a/
server-src/infofile.c
+++ b/
server-src/infofile.c
@@
-241,10
+241,10
@@
read_txinfofile(
amfree(line);
return 0; /* normal end of record */
}
amfree(line);
return 0; /* normal end of record */
}
- else if (strncmp
(line,"last_level:",11
) == 0) {
+ else if (strncmp
_const(line,"last_level:"
) == 0) {
break; /* normal */
}
break; /* normal */
}
- else if (strncmp
(line,"history:",8
) == 0) {
+ else if (strncmp
_const(line,"history:"
) == 0) {
break; /* normal */
}
memset(&onestat, 0, SIZEOF(onestat));
break; /* normal */
}
memset(&onestat, 0, SIZEOF(onestat));
@@
-252,13
+252,9
@@
read_txinfofile(
s = line;
ch = *s++;
s = line;
ch = *s++;
-#define sc "stats:"
- if(strncmp(line, sc, SIZEOF(sc)-1) != 0) {
+ if(strncmp_const_skip(line, "stats:", s, ch) != 0) {
break;
}
break;
}
- s += SIZEOF(sc)-1;
- ch = s[-1];
-#undef sc
skip_whitespace(s, ch);
if(ch == '\0' || sscanf((s - 1), "%d", &level) != 1) {
skip_whitespace(s, ch);
if(ch == '\0' || sscanf((s - 1), "%d", &level) != 1) {
@@
-354,14
+350,10
@@
read_txinfofile(
s = line;
ch = *s++;
s = line;
ch = *s++;
-#define sc "history:"
- if(strncmp(line, sc, SIZEOF(sc)-1) != 0) {
+ if(strncmp_const_skip(line, "history:", s, ch) != 0) {
amfree(line);
break;
}
amfree(line);
break;
}
- s += SIZEOF(sc)-1;
- ch = s[-1];
-#undef sc
skip_whitespace(s, ch);
if(ch == '\0' || sscanf((s - 1), "%d", &onehistory.level) != 1) {
skip_whitespace(s, ch);
if(ch == '\0' || sscanf((s - 1), "%d", &onehistory.level) != 1) {