Module Name: src
Committed By: rillig
Date: Sun Nov 3 10:43:28 UTC 2024
Modified Files:
src/sbin/amrctl: amrctl.c
src/sbin/drvctl: drvctl.c
src/sbin/mount_efs: mount_efs.c
src/usr.bin/aiomixer: main.c
src/usr.bin/fincore: fincore.c
src/usr.bin/scmdctl: scmdctl.c
src/usr.bin/telnet: main.c
src/usr.bin/tip: cu.c
src/usr.sbin/timed/timed: timed.c
src/usr.sbin/tprof: tprof_analyze.c
Log Message:
sbin, usr.bin, usr.sbin: remove redundant getopt declarations
No binary change, except for assertion line numbers in tprof.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sbin/amrctl/amrctl.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/drvctl/drvctl.c
cvs rdiff -u -r1.5 -r1.6 src/sbin/mount_efs/mount_efs.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/aiomixer/main.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/fincore/fincore.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/scmdctl/scmdctl.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/telnet/main.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/tip/cu.c
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/timed/timed/timed.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/tprof/tprof_analyze.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/amrctl/amrctl.c
diff -u src/sbin/amrctl/amrctl.c:1.12 src/sbin/amrctl/amrctl.c:1.13
--- src/sbin/amrctl/amrctl.c:1.12 Sun Sep 6 02:34:02 2020
+++ src/sbin/amrctl/amrctl.c Sun Nov 3 10:43:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: amrctl.c,v 1.12 2020/09/06 02:34:02 mrg Exp $ */
+/* $NetBSD: amrctl.c,v 1.13 2024/11/03 10:43:26 rillig Exp $ */
/*-
* Copyright (c) 2002, Pierre David <[email protected]>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: amrctl.c,v 1.12 2020/09/06 02:34:02 mrg Exp $");
+__RCSID("$NetBSD: amrctl.c,v 1.13 2024/11/03 10:43:26 rillig Exp $");
#endif
#include <stdio.h>
@@ -591,9 +591,6 @@ main(int argc, char *argv[])
char sdev[MAXPATHLEN];
char *pdev;
- extern char *optarg;
- extern int optind;
-
/*
* Parse arguments
*/
Index: src/sbin/drvctl/drvctl.c
diff -u src/sbin/drvctl/drvctl.c:1.22 src/sbin/drvctl/drvctl.c:1.23
--- src/sbin/drvctl/drvctl.c:1.22 Sun Aug 21 07:51:30 2022
+++ src/sbin/drvctl/drvctl.c Sun Nov 3 10:43:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: drvctl.c,v 1.22 2022/08/21 07:51:30 mlelstv Exp $ */
+/* $NetBSD: drvctl.c,v 1.23 2024/11/03 10:43:26 rillig Exp $ */
/*
* Copyright (c) 2004
@@ -68,8 +68,6 @@ main(int argc, char **argv)
bool nflag = false, tflag = false;
int c, mode;
char *attr = 0;
- extern char *optarg;
- extern int optind;
int fd, res;
struct devpmargs paa = { .devname = "", .flags = 0 };
struct devdetachargs daa;
Index: src/sbin/mount_efs/mount_efs.c
diff -u src/sbin/mount_efs/mount_efs.c:1.5 src/sbin/mount_efs/mount_efs.c:1.6
--- src/sbin/mount_efs/mount_efs.c:1.5 Mon Aug 29 14:35:00 2011
+++ src/sbin/mount_efs/mount_efs.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_efs.c,v 1.5 2011/08/29 14:35:00 joerg Exp $ */
+/* $NetBSD: mount_efs.c,v 1.6 2024/11/03 10:43:27 rillig Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble <[email protected]>
@@ -57,8 +57,6 @@ mount_efs_parseargs(int argc, char **arg
char *canon_dev, char *canon_dir)
{
int ch;
- extern int optind;
- extern char *optarg;
mntoptparse_t mp;
memset(args, 0, sizeof(*args));
Index: src/usr.bin/aiomixer/main.c
diff -u src/usr.bin/aiomixer/main.c:1.6 src/usr.bin/aiomixer/main.c:1.7
--- src/usr.bin/aiomixer/main.c:1.6 Mon May 20 22:21:45 2024
+++ src/usr.bin/aiomixer/main.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.6 2024/05/20 22:21:45 nia Exp $ */
+/* $NetBSD: main.c,v 1.7 2024/11/03 10:43:27 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -499,8 +499,6 @@ int
main(int argc, char **argv)
{
const char *mixer_device = NULL;
- extern char *optarg;
- extern int optind;
struct aiomixer *aio;
char mixer_path[32];
unsigned int mixer_count = 0;
Index: src/usr.bin/fincore/fincore.c
diff -u src/usr.bin/fincore/fincore.c:1.1 src/usr.bin/fincore/fincore.c:1.2
--- src/usr.bin/fincore/fincore.c:1.1 Fri Dec 9 15:17:34 2011
+++ src/usr.bin/fincore/fincore.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fincore.c,v 1.1 2011/12/09 15:17:34 yamt Exp $ */
+/* $NetBSD: fincore.c,v 1.2 2024/11/03 10:43:27 rillig Exp $ */
/*-
* Copyright (c) 2011 YAMAMOTO Takashi,
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__NetBSD__)
#ifndef lint
-__RCSID("$NetBSD: fincore.c,v 1.1 2011/12/09 15:17:34 yamt Exp $");
+__RCSID("$NetBSD: fincore.c,v 1.2 2024/11/03 10:43:27 rillig Exp $");
#endif /* not lint */
#endif /* defined(__NetBSD__) */
@@ -174,7 +174,6 @@ int
/*ARGSUSED*/
main(int argc, char *argv[])
{
- extern int optind;
long l;
int ch;
Index: src/usr.bin/scmdctl/scmdctl.c
diff -u src/usr.bin/scmdctl/scmdctl.c:1.1 src/usr.bin/scmdctl/scmdctl.c:1.2
--- src/usr.bin/scmdctl/scmdctl.c:1.1 Tue Dec 7 17:39:55 2021
+++ src/usr.bin/scmdctl/scmdctl.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: scmdctl.c,v 1.1 2021/12/07 17:39:55 brad Exp $ */
+/* $NetBSD: scmdctl.c,v 1.2 2024/11/03 10:43:27 rillig Exp $ */
/*
* Copyright (c) 2021 Brad Spencer <[email protected]>
@@ -18,7 +18,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: scmdctl.c,v 1.1 2021/12/07 17:39:55 brad Exp $");
+__RCSID("$NetBSD: scmdctl.c,v 1.2 2024/11/03 10:43:27 rillig Exp $");
#endif
/* Main userland program that knows how to talk to the Sparkfun
@@ -166,8 +166,6 @@ main(int argc, char *argv[])
int lock_type = -1;
bool list_names = false;
struct function_block func_block;
- extern char *optarg;
- extern int optind;
while ((c = getopt(argc, argv, "db:s:lh")) != -1 ) {
switch (c) {
Index: src/usr.bin/telnet/main.c
diff -u src/usr.bin/telnet/main.c:1.32 src/usr.bin/telnet/main.c:1.33
--- src/usr.bin/telnet/main.c:1.32 Fri Dec 14 23:40:17 2018
+++ src/usr.bin/telnet/main.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.32 2018/12/14 23:40:17 christos Exp $ */
+/* $NetBSD: main.c,v 1.33 2024/11/03 10:43:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: main.c,v 1.32 2018/12/14 23:40:17 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.33 2024/11/03 10:43:27 rillig Exp $");
#endif
#endif /* not lint */
@@ -119,8 +119,6 @@ usage(void)
int
main(int argc, char *argv[])
{
- extern char *optarg;
- extern int optind;
int ch;
char *user;
#ifdef FORWARD
Index: src/usr.bin/tip/cu.c
diff -u src/usr.bin/tip/cu.c:1.24 src/usr.bin/tip/cu.c:1.25
--- src/usr.bin/tip/cu.c:1.24 Sun Aug 18 14:16:02 2019
+++ src/usr.bin/tip/cu.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cu.c,v 1.24 2019/08/18 14:16:02 christos Exp $ */
+/* $NetBSD: cu.c,v 1.25 2024/11/03 10:43:27 rillig Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: cu.c,v 1.24 2019/08/18 14:16:02 christos Exp $");
+__RCSID("$NetBSD: cu.c,v 1.25 2024/11/03 10:43:27 rillig Exp $");
#endif /* not lint */
#include "tip.h"
@@ -58,8 +58,6 @@ cumain(int argc, char *argv[])
int useresc = '~';
static char sbuf[12];
int cmdlineBR;
- extern char *optarg;
- extern int optind;
static struct option longopts[] = {
{ "help", no_argument, &helpme, 1 },
Index: src/usr.sbin/timed/timed/timed.c
diff -u src/usr.sbin/timed/timed/timed.c:1.30 src/usr.sbin/timed/timed/timed.c:1.31
--- src/usr.sbin/timed/timed/timed.c:1.30 Tue Aug 8 06:31:58 2023
+++ src/usr.sbin/timed/timed/timed.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: timed.c,v 1.30 2023/08/08 06:31:58 mrg Exp $ */
+/* $NetBSD: timed.c,v 1.31 2024/11/03 10:43:27 rillig Exp $ */
/*-
* Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 19
#if 0
static char sccsid[] = "@(#)timed.c 8.2 (Berkeley) 3/26/95";
#else
-__RCSID("$NetBSD: timed.c,v 1.30 2023/08/08 06:31:58 mrg Exp $");
+__RCSID("$NetBSD: timed.c,v 1.31 2024/11/03 10:43:27 rillig Exp $");
#endif
#endif /* not lint */
@@ -133,8 +133,6 @@ main(int argc, char *argv[])
struct sockaddr_in server;
uint16_t port;
int c;
- extern char *optarg;
- extern int optind, opterr;
struct ifaddrs *ifap, *ifa;
#define IN_MSG "-i and -n make no sense together\n"
Index: src/usr.sbin/tprof/tprof_analyze.c
diff -u src/usr.sbin/tprof/tprof_analyze.c:1.8 src/usr.sbin/tprof/tprof_analyze.c:1.9
--- src/usr.sbin/tprof/tprof_analyze.c:1.8 Thu Dec 1 00:43:27 2022
+++ src/usr.sbin/tprof/tprof_analyze.c Sun Nov 3 10:43:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_analyze.c,v 1.8 2022/12/01 00:43:27 ryo Exp $ */
+/* $NetBSD: tprof_analyze.c,v 1.9 2024/11/03 10:43:27 rillig Exp $ */
/*
* Copyright (c) 2010,2011,2012 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: tprof_analyze.c,v 1.8 2022/12/01 00:43:27 ryo Exp $");
+__RCSID("$NetBSD: tprof_analyze.c,v 1.9 2024/11/03 10:43:27 rillig Exp $");
#endif /* not lint */
#include <assert.h>
@@ -142,8 +142,6 @@ tprof_analyze(int argc, char **argv)
bool distinguish_cpus = true;
bool distinguish_lwps = true;
bool kernel_only = false;
- extern char *optarg;
- extern int optind;
FILE *f;
while ((ch = getopt(argc, argv, "CkLPp:s")) != -1) {
