Hello,
Attached patches remove the main() prototype from
src/{sbin,usr.bin,usb.sbin}
Next sweep will be to mark usage() as static __dead.
Sevan
Index: usr.bin/cap_mkdb/cap_mkdb.c
===================================================================
RCS file: /cvs/src/usr.bin/cap_mkdb/cap_mkdb.c,v
retrieving revision 1.22
diff -u -p -r1.22 cap_mkdb.c
--- usr.bin/cap_mkdb/cap_mkdb.c 4 Dec 2015 19:15:54 -0000 1.22
+++ usr.bin/cap_mkdb/cap_mkdb.c 5 Sep 2016 02:22:41 -0000
@@ -50,7 +50,6 @@ void db_build(char **);
void dounlink(void);
void usage(void);
int igetnext(char **, char **);
-int main(int, char *[]);
DB *capdbp;
int verbose;
Index: usr.bin/login/login.c
===================================================================
RCS file: /cvs/src/usr.bin/login/login.c,v
retrieving revision 1.68
diff -u -p -r1.68 login.c
--- usr.bin/login/login.c 21 Aug 2016 03:26:04 -0000 1.68
+++ usr.bin/login/login.c 5 Sep 2016 02:22:41 -0000
@@ -109,7 +109,6 @@ void sighup(int);
void sleepexit(int);
char *stypeof(char *);
void timedout(int);
-int main(int, char **);
extern int check_failedlogin(uid_t);
extern void log_failedlogin(uid_t, char *, char *, char *);
Index: usr.bin/m4/main.c
===================================================================
RCS file: /cvs/src/usr.bin/m4/main.c,v
retrieving revision 1.86
diff -u -p -r1.86 main.c
--- usr.bin/m4/main.c 3 Nov 2015 16:21:47 -0000 1.86
+++ usr.bin/m4/main.c 5 Sep 2016 02:22:41 -0000
@@ -157,8 +157,6 @@ static void reallyputchar(int);
static void enlarge_stack(void);
-int main(int, char *[]);
-
int exit_code = 0;
int
Index: usr.bin/make/main.c
===================================================================
RCS file: /cvs/src/usr.bin/make/main.c,v
retrieving revision 1.119
diff -u -p -r1.119 main.c
--- usr.bin/make/main.c 4 Jan 2016 10:59:23 -0000 1.119
+++ usr.bin/make/main.c 5 Sep 2016 02:22:41 -0000
@@ -624,7 +624,6 @@ read_all_make_rules(bool noBuiltins, boo
}
-int main(int, char **);
/*-
* main --
* The main function, for obvious reasons. Initializes variables
Index: usr.bin/make/regress.c
===================================================================
RCS file: /cvs/src/usr.bin/make/regress.c,v
retrieving revision 1.8
diff -u -p -r1.8 regress.c
--- usr.bin/make/regress.c 15 Nov 2015 06:01:39 -0000 1.8
+++ usr.bin/make/regress.c 5 Sep 2016 02:22:41 -0000
@@ -33,7 +33,6 @@
#include "defines.h"
#include "str.h"
-int main(void);
#define CHECK(s) \
do { \
printf("%-65s", #s); \
Index: usr.bin/midiplay/midiplay.c
===================================================================
RCS file: /cvs/src/usr.bin/midiplay/midiplay.c,v
retrieving revision 1.18
diff -u -p -r1.18 midiplay.c
--- usr.bin/midiplay/midiplay.c 5 May 2016 09:18:12 -0000 1.18
+++ usr.bin/midiplay/midiplay.c 5 Sep 2016 02:22:41 -0000
@@ -86,7 +86,6 @@ u_long getvar(struct track *);
void playfile(FILE *, char *);
void playdata(u_char *, u_int, char *);
void sigalrm(int);
-int main(int argc, char **argv);
extern char *__progname;
Index: usr.bin/rdist/rdist.c
===================================================================
RCS file: /cvs/src/usr.bin/rdist/rdist.c,v
retrieving revision 1.30
diff -u -p -r1.30 rdist.c
--- usr.bin/rdist/rdist.c 8 Feb 2015 23:40:34 -0000 1.30
+++ usr.bin/rdist/rdist.c 5 Sep 2016 02:22:42 -0000
@@ -58,7 +58,6 @@ char *path_remsh = NULL;
static void addhostlist(char *, struct namelist **);
static void usage(void);
-int main(int, char **, char **);
/*
* Add a hostname to the host list
Index: usr.bin/rdistd/rdistd.c
===================================================================
RCS file: /cvs/src/usr.bin/rdistd/rdistd.c,v
retrieving revision 1.10
diff -u -p -r1.10 rdistd.c
--- usr.bin/rdistd/rdistd.c 8 Feb 2015 23:40:34 -0000 1.10
+++ usr.bin/rdistd/rdistd.c 5 Sep 2016 02:22:42 -0000
@@ -35,7 +35,6 @@
#include "server.h"
-int main(int, char **, char **);
static void usage(void);
/*
Index: usr.bin/renice/renice.c
===================================================================
RCS file: /cvs/src/usr.bin/renice/renice.c,v
retrieving revision 1.19
diff -u -p -r1.19 renice.c
--- usr.bin/renice/renice.c 22 Oct 2015 07:52:29 -0000 1.19
+++ usr.bin/renice/renice.c 5 Sep 2016 02:22:42 -0000
@@ -41,7 +41,6 @@ struct renice_param {
id_t id;
};
-int main(int, char **);
static int renice(struct renice_param *, struct renice_param *);
__dead void usage(void);
Index: usr.bin/tsort/tsort.c
===================================================================
RCS file: /cvs/src/usr.bin/tsort/tsort.c,v
retrieving revision 1.35
diff -u -p -r1.35 tsort.c
--- usr.bin/tsort/tsort.c 5 Jan 2016 16:10:57 -0000 1.35
+++ usr.bin/tsort/tsort.c 5 Sep 2016 02:22:42 -0000
@@ -160,8 +160,6 @@ static int quiet_flag, long_flag,
warn_flag, hints_flag, verbose_flag;
-int main(int, char *[]);
-
/***
*** Memory handling.
***/
@@ -597,7 +595,6 @@ find_smallest_node(struct array *h)
return u;
}
-
/***
*** Graph algorithms.
***/
Index: usr.sbin/bgpctl/bgpctl.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpctl/bgpctl.c,v
retrieving revision 1.188
diff -u -p -r1.188 bgpctl.c
--- usr.sbin/bgpctl/bgpctl.c 3 Jun 2016 17:36:37 -0000 1.188
+++ usr.sbin/bgpctl/bgpctl.c 5 Sep 2016 02:25:34 -0000
@@ -46,7 +46,6 @@ enum neighbor_views {
NV_TIMERS
};
-int main(int, char *[]);
char *fmt_peer(const char *, const struct bgpd_addr *, int, int);
void show_summary_head(void);
int show_summary_msg(struct imsg *, int);
Index: usr.sbin/mailwrapper/mailwrapper.c
===================================================================
RCS file: /cvs/src/usr.sbin/mailwrapper/mailwrapper.c,v
retrieving revision 1.22
diff -u -p -r1.22 mailwrapper.c
--- usr.sbin/mailwrapper/mailwrapper.c 28 Dec 2015 16:27:28 -0000 1.22
+++ usr.sbin/mailwrapper/mailwrapper.c 5 Sep 2016 02:25:35 -0000
@@ -48,8 +48,6 @@ struct arglist {
char **argv;
};
-int main(int, char *[], char *[]);
-
static void initarg(struct arglist *);
static void addarg(struct arglist *, const char *);
Index: usr.sbin/rpc.statd/statd.c
===================================================================
RCS file: /cvs/src/usr.sbin/rpc.statd/statd.c,v
retrieving revision 1.2
diff -u -p -r1.2 statd.c
--- usr.sbin/rpc.statd/statd.c 16 Jan 2015 06:40:20 -0000 1.2
+++ usr.sbin/rpc.statd/statd.c 5 Sep 2016 02:25:36 -0000
@@ -82,8 +82,6 @@ static void init_file(char *);
static int notify_one_host(char *);
static void die(int);
-int main(int, char **);
-
int
main(int argc, char **argv)
{
Index: usr.sbin/usbdevs/usbdevs.c
===================================================================
RCS file: /cvs/src/usr.sbin/usbdevs/usbdevs.c,v
retrieving revision 1.25
diff -u -p -r1.25 usbdevs.c
--- usr.sbin/usbdevs/usbdevs.c 22 Dec 2015 08:36:40 -0000 1.25
+++ usr.sbin/usbdevs/usbdevs.c 5 Sep 2016 02:25:37 -0000
@@ -53,7 +53,6 @@ void usage(void);
void usbdev(int f, int a, int rec);
void usbdump(int f);
void dumpone(char *name, int f, int addr);
-int main(int, char **);
extern char *__progname;
Index: usr.sbin/vmd/vmd.c
===================================================================
RCS file: /cvs/src/usr.sbin/vmd/vmd.c,v
retrieving revision 1.29
diff -u -p -r1.29 vmd.c
--- usr.sbin/vmd/vmd.c 17 Aug 2016 05:07:13 -0000 1.29
+++ usr.sbin/vmd/vmd.c 5 Sep 2016 02:25:37 -0000
@@ -38,7 +38,6 @@
__dead void usage(void);
-int main(int, char **);
int vmd_configure(void);
void vmd_sighdlr(int sig, short event, void *arg);
void vmd_shutdown(void);
Index: usr.sbin/wsconscfg/wsconscfg.c
===================================================================
RCS file: /cvs/src/usr.sbin/wsconscfg/wsconscfg.c,v
retrieving revision 1.14
diff -u -p -r1.14 wsconscfg.c
--- usr.sbin/wsconscfg/wsconscfg.c 9 Feb 2015 23:00:15 -0000 1.14
+++ usr.sbin/wsconscfg/wsconscfg.c 5 Sep 2016 02:25:37 -0000
@@ -50,7 +50,6 @@
#define DEFDEV "/dev/ttyCcfg"
static void usage(void);
-int main(int, char**);
static void
usage(void)
Index: usr.sbin/wsfontload/wsfontload.c
===================================================================
RCS file: /cvs/src/usr.sbin/wsfontload/wsfontload.c,v
retrieving revision 1.16
diff -u -p -r1.16 wsfontload.c
--- usr.sbin/wsfontload/wsfontload.c 6 Sep 2015 20:07:46 -0000 1.16
+++ usr.sbin/wsfontload/wsfontload.c 5 Sep 2016 02:25:37 -0000
@@ -53,7 +53,6 @@
#define DEFBITORDER WSDISPLAY_FONTORDER_L2R
#define DEFBYTEORDER WSDISPLAY_FONTORDER_L2R
-int main(int, char**);
static void usage(void);
static int getencoding(char *);
Index: sbin/atactl/atactl.c
===================================================================
RCS file: /cvs/src/sbin/atactl/atactl.c,v
retrieving revision 1.46
diff -u -p -r1.46 atactl.c
--- sbin/atactl/atactl.c 20 Aug 2015 22:02:20 -0000 1.46
+++ sbin/atactl/atactl.c 5 Sep 2016 02:18:55 -0000
@@ -69,7 +69,6 @@ struct valinfo {
const char *string;
};
-int main(int, char *[]);
__dead void usage(void);
void ata_command(struct atareq *);
void print_bitinfo(const char *, u_int, struct bitinfo *);
Index: sbin/fsck/fsck.c
===================================================================
RCS file: /cvs/src/sbin/fsck/fsck.c,v
retrieving revision 1.38
diff -u -p -r1.38 fsck.c
--- sbin/fsck/fsck.c 23 Nov 2015 19:19:29 -0000 1.38
+++ sbin/fsck/fsck.c 5 Sep 2016 02:18:55 -0000
@@ -70,8 +70,6 @@ static int maxrun;
static char *options;
static int flags;
-int main(int, char *[]);
-
static int checkfs(const char *, const char *, const char *, void *, pid_t *);
static int selected(const char *);
static void addoption(char *);
Index: sbin/fsck_ext2fs/main.c
===================================================================
RCS file: /cvs/src/sbin/fsck_ext2fs/main.c,v
retrieving revision 1.27
diff -u -p -r1.27 main.c
--- sbin/fsck_ext2fs/main.c 16 Mar 2016 15:41:10 -0000 1.27
+++ sbin/fsck_ext2fs/main.c 5 Sep 2016 02:18:55 -0000
@@ -52,8 +52,6 @@
volatile sig_atomic_t returntosingle;
-int main(int, char *[]);
-
static int argtoi(int, char *, char *, int);
static int checkfilesys(char *, char *, long, int);
static void usage(void);
Index: sbin/fsck_msdos/main.c
===================================================================
RCS file: /cvs/src/sbin/fsck_msdos/main.c,v
retrieving revision 1.23
diff -u -p -r1.23 main.c
--- sbin/fsck_msdos/main.c 28 May 2016 18:00:42 -0000 1.23
+++ sbin/fsck_msdos/main.c 5 Sep 2016 02:18:55 -0000
@@ -44,7 +44,6 @@ int preen; /* set when preening */
int rdonly; /* device is opened read only (supersedes above) */
static void usage(void);
-int main(int, char **);
static void
usage(void)
Index: sbin/fsdb/fsdb.c
===================================================================
RCS file: /cvs/src/sbin/fsdb/fsdb.c,v
retrieving revision 1.30
diff -u -p -r1.30 fsdb.c
--- sbin/fsdb/fsdb.c 7 Jun 2016 01:29:38 -0000 1.30
+++ sbin/fsdb/fsdb.c 5 Sep 2016 02:18:55 -0000
@@ -55,7 +55,6 @@
extern char *__progname; /* from crt0.o */
-int main(int, char *[]);
static void usage(void);
static int cmdloop(void);
static int helpfn(int, char *[]);
Index: sbin/ifconfig/ifconfig.c
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.330
diff -u -p -r1.330 ifconfig.c
--- sbin/ifconfig/ifconfig.c 3 Sep 2016 13:46:57 -0000 1.330
+++ sbin/ifconfig/ifconfig.c 5 Sep 2016 02:18:56 -0000
@@ -220,7 +220,6 @@ void mpe_status(void);
void mpw_status(void);
void vlan_status(void);
void setrdomain(const char *, int);
-int main(int, char *[]);
int prefix(void *val, int);
void getifgroups(void);
void setifgroup(const char *, int);
Index: sbin/ncheck_ffs/ncheck_ffs.c
===================================================================
RCS file: /cvs/src/sbin/ncheck_ffs/ncheck_ffs.c,v
retrieving revision 1.53
diff -u -p -r1.53 ncheck_ffs.c
--- sbin/ncheck_ffs/ncheck_ffs.c 28 May 2016 23:46:06 -0000 1.53
+++ sbin/ncheck_ffs/ncheck_ffs.c 5 Sep 2016 02:18:56 -0000
@@ -119,7 +119,6 @@ int matchino(const void *, const void *)
int matchcache(const void *, const void *);
void cacheino(ufsino_t, void *);
void *cached(ufsino_t);
-int main(int, char *[]);
char *rawname(char *);
void format_entry(const char *, struct direct *);
Index: sbin/ping6/ping6.c
===================================================================
RCS file: /cvs/src/sbin/ping6/ping6.c,v
retrieving revision 1.155
diff -u -p -r1.155 ping6.c
--- sbin/ping6/ping6.c 4 Sep 2016 10:44:28 -0000 1.155
+++ sbin/ping6/ping6.c 5 Sep 2016 02:18:56 -0000
@@ -197,7 +197,6 @@ volatile sig_atomic_t seenalrm;
volatile sig_atomic_t seenint;
volatile sig_atomic_t seeninfo;
-int main(int, char *[]);
void fill(char *, char *);
int get_hoplim(struct msghdr *);
int get_pathmtu(struct msghdr *);
