From nobody Tue Dec 14 01:22:04 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B0CC518D9077; Tue, 14 Dec 2021 01:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCgb100vQz4sRh; Tue, 14 Dec 2021 01:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B1891F19F; Tue, 14 Dec 2021 01:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BE1M4Tx064944; Tue, 14 Dec 2021 01:22:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BE1M4iL064943; Tue, 14 Dec 2021 01:22:04 GMT (envelope-from git) Date: Tue, 14 Dec 2021 01:22:04 GMT Message-Id: <202112140122.1BE1M4iL064943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 13c6b47d767b - stable/12 - ippool: remove set-but-not-unused vars List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 13c6b47d767b8f1f75612d34a41d654baa43d660 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639444925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MFVI+lLmaldhzZ6uP1phDexhnyzgIfLIzLQzMBR1mPk=; b=mLQr8NrezwV9M+fNFQ+k7Myyxop2V6yVQc5jEo2/nCh7ypdKvuSTaiy8pCZtjWRqvbkmaQ ggMvq+voNzDkCMsrvYGGZqoJ2ddt52ASHRASd+1fLDsdroJbCdrofxJJMnkuK6IZN6jQ+b wLUkyZjh9iiSbOG8xLe+8Rb2TQldxeXrqYsK6lDGtUl1dLpE3zGPW+CcVOfq1x3zsqLH3o SQcTgQhPn7Jnag3VcJAhhlDJ2Eom/NDKumgEduHXj8Nt8nUODndk+yk9j6L1AU9I8aqmyU PKzVrKPMf0hx5IXrt7PoJq82lwQRaNZOUlFR6BS99ia8BttPf8KtfS60DM5dxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639444925; a=rsa-sha256; cv=none; b=vj0QYTTUs1AsZNz7FlcQ5lV3ONnkgHI7rWYe0abNiCa4JeYunodtIRc6GKKvUBhKVfYCzq ixA3HeO2dnHWW2TFt/3g0jtuSil2qTW+KEqZ/wcEJLmHafswBVCKL3160UvBPlBjsUk3ri RD/QFdyZO3su6UFLOvZVcST6tCE3WlC5FAQ78s0XdbA0I3A+aKK7lozMxgpZKIGj8HubCd iW+DTYRmdf1JXv9P3ccc4EwVnjZnzYMcdgDKqkM0Hi4lDcHmXRokG8lyjF9nZEbq7Rh0PM A1sI0B/Xmd+GVeNqtOYUTt4vDoKJvM2lsWQiRG1M0RRafdd2l+PHOHx/LjDqVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=13c6b47d767b8f1f75612d34a41d654baa43d660 commit 13c6b47d767b8f1f75612d34a41d654baa43d660 Author: Cy Schubert AuthorDate: 2021-12-11 05:01:14 +0000 Commit: Cy Schubert 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 ] [-o ] [-t ] .br .B ippool --s [-dtv] [-M ] [-N ] +-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 ] [-t ] [-o ] [-M ] [-N ]\n"); fprintf(stderr, "\t-r [-dnv] [-m ] [-o ] [-t type] -i [/netmask]\n"); fprintf(stderr, "\t-R [-dnv] [-m ] [-o ] [-t ]\n"); - fprintf(stderr, "\t-s [-dtv] [-M ] [-N ]\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) {