diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ipset.c | 9 | ||||
| -rw-r--r-- | src/ui.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/ipset.c b/src/ipset.c index e649f08..2709d7b 100644 --- a/src/ipset.c +++ b/src/ipset.c @@ -129,7 +129,7 @@ help(void) } int -ipset_parse_file(struct ipset_session *session UNUSED, +ipset_parse_file(struct ipset_session *s UNUSED, int opt UNUSED, const char *str) { if (filename != NULL) @@ -140,6 +140,7 @@ ipset_parse_file(struct ipset_session *session UNUSED, return 0; } +static int __attribute__ ((format (printf, 1, 2))) ipset_print_file(const char *fmt, ...) { @@ -190,7 +191,7 @@ restore(char *argv0) { int ret = 0; char *c; - FILE *fread = stdin; + FILE *rfd = stdin; /* Initialize newargv/newargc */ newargc = 0; @@ -202,10 +203,10 @@ restore(char *argv0) "Cannot open %s for reading: %s", filename, strerror(errno)); } - fread = fd; + rfd = fd; } - while (fgets(cmdline, sizeof(cmdline), fread)) { + while (fgets(cmdline, sizeof(cmdline), rfd)) { restore_line++; c = cmdline; while (isspace(c[0])) @@ -179,10 +179,6 @@ ipset_match_cmd(const char *arg, const char * const name[]) * -! -exist */ -int -ipset_parse_file(struct ipset_session *session, - int opt, const char *str); - const struct ipset_envopts ipset_envopts[] = { { .name = { "-o", "-output" }, .has_arg = IPSET_MANDATORY_ARG, .flag = IPSET_OPT_MAX, |