From owner-svn-src-all@freebsd.org Tue Dec 31 22:19:34 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76F441DE947; Tue, 31 Dec 2019 22:19:34 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47nTHV2ZRKz3GXY; Tue, 31 Dec 2019 22:19:34 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53A2620D03; Tue, 31 Dec 2019 22:19:34 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBVMJYnE067970; Tue, 31 Dec 2019 22:19:34 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBVMJYxJ067969; Tue, 31 Dec 2019 22:19:34 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201912312219.xBVMJYxJ067969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Tue, 31 Dec 2019 22:19:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356242 - head/usr.bin/nfsstat X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.bin/nfsstat X-SVN-Commit-Revision: 356242 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Dec 2019 22:19:34 -0000 Author: rmacklem Date: Tue Dec 31 22:19:33 2019 New Revision: 356242 URL: https://svnweb.freebsd.org/changeset/base/356242 Log: Get rid of old nfsstat options no longer used. The "-M" and "-N" options for nfsstat were used by the old NFS code and have never done anything for the new NFS code. This patch replaces code that assigns values to variables that are never used with printf()s noting the options are ignored. This has the side effect that it gets rid of warnings w.r.t. these variables being assigned but never used, that occur for some builds. Noticed during integration of the NFSv4.2 code. Modified: head/usr.bin/nfsstat/nfsstat.c Modified: head/usr.bin/nfsstat/nfsstat.c ============================================================================== --- head/usr.bin/nfsstat/nfsstat.c Tue Dec 31 22:01:08 2019 (r356241) +++ head/usr.bin/nfsstat/nfsstat.c Tue Dec 31 22:19:33 2019 (r356242) @@ -149,14 +149,12 @@ main(int argc, char **argv) int serverOnly = -1; int newStats = 0; int ch; - char *memf, *nlistf; int mntlen, i; char buf[1024]; struct statfs *mntbuf; struct nfscl_dumpmntopts dumpmntopts; interval = 0; - memf = nlistf = NULL; argc = xo_parse_args(argc, argv); if (argc < 0) @@ -167,7 +165,7 @@ main(int argc, char **argv) while ((ch = getopt(argc, argv, "cdEesWM:mN:w:zq")) != -1) switch(ch) { case 'M': - memf = optarg; + printf("*** -M option deprecated, ignored\n\n"); break; case 'm': /* Display mount options for NFS mount points. */ @@ -191,7 +189,7 @@ main(int argc, char **argv) } exit(0); case 'N': - nlistf = optarg; + printf("*** -N option deprecated, ignored\n\n"); break; case 'W': widemode = 1; @@ -239,14 +237,8 @@ main(int argc, char **argv) #define BACKWARD_COMPATIBILITY #ifdef BACKWARD_COMPATIBILITY - if (*argv) { + if (*argv) interval = atoi(*argv); - if (*++argv) { - nlistf = *argv; - if (*++argv) - memf = *argv; - } - } #endif if (modfind("nfscommon") < 0) xo_err(1, "NFS client/server not loaded"); @@ -529,7 +521,7 @@ static void usage(void) { (void)fprintf(stderr, - "usage: nfsstat [-cdemszW] [-M core] [-N system] [-w wait]\n"); + "usage: nfsstat [-cdemszW] [-w wait]\n"); exit(1); }