Module Name: src
Committed By: christos
Date: Sun Oct 20 03:09:11 UTC 2013
Modified Files:
src/external/bsd/ipf/dist/lib: ipft_hx.c ipft_tx.c printfieldhdr.c
printfraginfo.c
src/external/bsd/ipf/dist/tools: ipfcomp.c ippool.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/lib/ipft_hx.c \
src/external/bsd/ipf/dist/lib/ipft_tx.c \
src/external/bsd/ipf/dist/lib/printfieldhdr.c \
src/external/bsd/ipf/dist/lib/printfraginfo.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/tools/ipfcomp.c \
src/external/bsd/ipf/dist/tools/ippool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ipf/dist/lib/ipft_hx.c
diff -u src/external/bsd/ipf/dist/lib/ipft_hx.c:1.2 src/external/bsd/ipf/dist/lib/ipft_hx.c:1.3
--- src/external/bsd/ipf/dist/lib/ipft_hx.c:1.2 Sun Jul 22 10:27:36 2012
+++ src/external/bsd/ipf/dist/lib/ipft_hx.c Sat Oct 19 23:09:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ipft_hx.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: ipft_hx.c,v 1.3 2013/10/20 03:09:11 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -65,10 +65,8 @@ static int hex_readip(mb, ifn, dir)
char line[513];
ip_t *ip;
char *buf;
- int cnt;
buf = (char *)mb->mb_buf;
- cnt = sizeof(mb->mb_buf);
/*
* interpret start of line as possibly "[ifname]" or
* "[in/out,ifname]".
Index: src/external/bsd/ipf/dist/lib/ipft_tx.c
diff -u src/external/bsd/ipf/dist/lib/ipft_tx.c:1.2 src/external/bsd/ipf/dist/lib/ipft_tx.c:1.3
--- src/external/bsd/ipf/dist/lib/ipft_tx.c:1.2 Sun Jul 22 10:27:36 2012
+++ src/external/bsd/ipf/dist/lib/ipft_tx.c Sat Oct 19 23:09:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ipft_tx.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: ipft_tx.c,v 1.3 2013/10/20 03:09:11 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -122,10 +122,8 @@ static int text_readip(mb, ifn, dir)
char line[513];
ip_t *ip;
char *buf;
- int cnt;
buf = (char *)mb->mb_buf;
- cnt = sizeof(mb->mb_buf);
*ifn = NULL;
while (fgets(line, sizeof(line)-1, tfp)) {
Index: src/external/bsd/ipf/dist/lib/printfieldhdr.c
diff -u src/external/bsd/ipf/dist/lib/printfieldhdr.c:1.2 src/external/bsd/ipf/dist/lib/printfieldhdr.c:1.3
--- src/external/bsd/ipf/dist/lib/printfieldhdr.c:1.2 Sun Jul 22 10:27:36 2012
+++ src/external/bsd/ipf/dist/lib/printfieldhdr.c Sat Oct 19 23:09:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: printfieldhdr.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printfieldhdr.c,v 1.3 2013/10/20 03:09:11 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -18,10 +18,9 @@ printfieldhdr(words, field)
{
wordtab_t *w;
char *s, *t;
- int i;
if (field->w_value == -2) {
- for (i = 0, w = words; w->w_word != NULL; ) {
+ for (w = words; w->w_word != NULL; ) {
if (w->w_value > 0) {
printfieldhdr(words, w);
w++;
Index: src/external/bsd/ipf/dist/lib/printfraginfo.c
diff -u src/external/bsd/ipf/dist/lib/printfraginfo.c:1.2 src/external/bsd/ipf/dist/lib/printfraginfo.c:1.3
--- src/external/bsd/ipf/dist/lib/printfraginfo.c:1.2 Sun Jul 22 10:27:36 2012
+++ src/external/bsd/ipf/dist/lib/printfraginfo.c Sat Oct 19 23:09:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: printfraginfo.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printfraginfo.c,v 1.3 2013/10/20 03:09:11 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -16,7 +16,6 @@ printfraginfo(prefix, ifr)
char *prefix;
struct ipfr *ifr;
{
- frentry_t fr;
int family;
PRINTF("%s", prefix);
@@ -27,10 +26,11 @@ printfraginfo(prefix, ifr)
PRINTF("inet");
family = AF_INET;
}
- fr.fr_flags = 0xffffffff;
PRINTF(" %s -> ", hostname(family, &ifr->ipfr_src));
/*
+ frentry_t fr;
+ fr.fr_flags = 0xffffffff;
if (kmemcpy((char *)&fr, (u_long)ifr->ipfr_rule,
sizeof(fr)) == -1)
return;
Index: src/external/bsd/ipf/dist/tools/ipfcomp.c
diff -u src/external/bsd/ipf/dist/tools/ipfcomp.c:1.3 src/external/bsd/ipf/dist/tools/ipfcomp.c:1.4
--- src/external/bsd/ipf/dist/tools/ipfcomp.c:1.3 Sun Jul 22 10:27:51 2012
+++ src/external/bsd/ipf/dist/tools/ipfcomp.c Sat Oct 19 23:09:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ipfcomp.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ipfcomp.c,v 1.4 2013/10/20 03:09:11 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -65,7 +65,6 @@ static FILE *cfile = NULL;
void printc(fr)
frentry_t *fr;
{
- fripf_t *ipf;
u_long *ulp;
char *and;
FILE *fp;
@@ -78,7 +77,6 @@ void printc(fr)
if ((fr->fr_type == FR_T_IPF) &&
((fr->fr_datype != FRI_NORMAL) || (fr->fr_satype != FRI_NORMAL)))
return;
- ipf = fr->fr_ipf;
if (cfile == NULL)
cfile = fopen("ip_rules.c", "w");
Index: src/external/bsd/ipf/dist/tools/ippool.c
diff -u src/external/bsd/ipf/dist/tools/ippool.c:1.3 src/external/bsd/ipf/dist/tools/ippool.c:1.4
--- src/external/bsd/ipf/dist/tools/ippool.c:1.3 Sun Jul 22 10:27:51 2012
+++ src/external/bsd/ipf/dist/tools/ippool.c Sat Oct 19 23:09:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ippool.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ippool.c,v 1.4 2013/10/20 03:09:11 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -409,16 +409,12 @@ poolstats(argc, argv)
int argc;
char *argv[];
{
- int c, type, role, live_kernel;
+ int c, type, role;
ipf_pool_stat_t plstat;
ipf_dstl_stat_t dlstat;
- char *kernel, *core;
iphtstat_t htstat;
iplookupop_t op;
- core = NULL;
- kernel = NULL;
- live_kernel = 1;
type = IPLT_ALL;
role = IPL_LOGALL;
@@ -431,12 +427,8 @@ poolstats(argc, argv)
opts |= OPT_DEBUG;
break;
case 'M' :
- live_kernel = 0;
- core = optarg;
break;
case 'N' :
- live_kernel = 0;
- kernel = optarg;
break;
case 'o' :
role = getrole(optarg);
