git: 13c6b47d767b - stable/12 - ippool: remove set-but-not-unused vars
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Dec 2021 01:22:04 UTC
The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=13c6b47d767b8f1f75612d34a41d654baa43d660 commit 13c6b47d767b8f1f75612d34a41d654baa43d660 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2021-12-11 05:01:14 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2021-12-14 01:18:10 +0000 ippool: remove set-but-not-unused vars Display of stats from a kernel core dump was never fully implemented. Remove the dangling vars and remove the documentation. (cherry picked from commit 2169572e743edf05696c04c641a6413a474cbf12) --- contrib/ipfilter/man/ippool.8 | 2 +- contrib/ipfilter/tools/ippool.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/contrib/ipfilter/man/ippool.8 b/contrib/ipfilter/man/ippool.8 index 3411ac19f409..3fe2ee841720 100644 --- a/contrib/ipfilter/man/ippool.8 +++ b/contrib/ipfilter/man/ippool.8 @@ -27,7 +27,7 @@ ippool \- user interface to the IPFilter pools -R [-dnv] [-m <name>] [-o <role>] [-t <type>] .br .B ippool --s [-dtv] [-M <core>] [-N <namelist>] +-s [-dtv] .SH DESCRIPTION .PP .B Ippool diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c index 62d096cef88d..98666f9868fd 100644 --- a/contrib/ipfilter/tools/ippool.c +++ b/contrib/ipfilter/tools/ippool.c @@ -76,7 +76,7 @@ usage(prog) fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>] [-o <role>] [-M <core>] [-N <namelist>]\n"); fprintf(stderr, "\t-r [-dnv] [-m <name>] [-o <role>] [-t type] -i <ipaddr>[/netmask]\n"); fprintf(stderr, "\t-R [-dnv] [-m <name>] [-o <role>] [-t <type>]\n"); - fprintf(stderr, "\t-s [-dtv] [-M <core>] [-N <namelist>]\n"); + fprintf(stderr, "\t-s [-dtv]\n"); exit(1); } @@ -431,16 +431,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; @@ -452,14 +448,6 @@ poolstats(argc, argv) case 'd' : 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); if (role == IPL_LOGNONE) {