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
/
amlogroll.c
diff --git
a/server-src/amlogroll.c
b/server-src/amlogroll.c
index f00c348e482f1d839027bcd931f2bd2649261f60..0132fd0aebfaec8cb46ae1b72186a8140ff20b03 100644
(file)
--- a/
server-src/amlogroll.c
+++ b/
server-src/amlogroll.c
@@
-69,7
+69,7
@@
int main(int argc, char **argv)
/*NOTREACHED*/
}
/*NOTREACHED*/
}
- parse_
server_
conf(argc, argv, &new_argc, &new_argv);
+ parse_conf(argc, argv, &new_argc, &new_argv);
my_argc = new_argc;
my_argv = new_argv;
my_argc = new_argc;
my_argv = new_argv;
@@
-156,13
+156,10
@@
void handle_start(void)
ch = *s++;
skip_whitespace(s, ch);
ch = *s++;
skip_whitespace(s, ch);
-#define sc "date"
- if(ch == '\0' || strncmp(s - 1, sc, SIZEOF(sc)-1) != 0) {
+ if(ch == '\0' || strncmp_const_skip(s - 1, "date", s, ch) != 0) {
return; /* ignore bogus line */
}
return; /* ignore bogus line */
}
- s += SIZEOF(sc) - 1;
- ch = s[-1];
-#undef sc
+
skip_whitespace(s, ch);
if(ch == '\0') {
return;
skip_whitespace(s, ch);
if(ch == '\0') {
return;