Date: Tue, 31 Dec 2019 22:19:34 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356242 - head/usr.bin/nfsstat Message-ID: <201912312219.xBVMJYxJ067969@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912312219.xBVMJYxJ067969>