Date: Fri, 7 Jul 2023 16:51:03 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 65f3be91104c - main - Mark usage function as __dead2 in programs where it does not return Message-ID: <202307071651.367Gp395010540@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65f3be91104cb27bbdd1997240edd6024bd95136 commit 65f3be91104cb27bbdd1997240edd6024bd95136 Author: Alfonso Gregory <gfunni234@gmail.com> AuthorDate: 2023-07-07 16:39:23 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-07-07 16:45:17 +0000 Mark usage function as __dead2 in programs where it does not return In most cases, usage does not return, so mark them as __dead2. For the cases where they do return, they have not been marked __dead2. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/735 --- sbin/adjkerntz/adjkerntz.c | 2 +- sbin/comcontrol/comcontrol.c | 2 +- sbin/fdisk/fdisk.c | 2 +- sbin/ldconfig/ldconfig.c | 2 +- sbin/mdconfig/mdconfig.c | 2 +- sbin/newfs/newfs.c | 2 +- sbin/newfs_msdos/newfs_msdos.c | 2 +- sbin/nos-tun/nos-tun.c | 2 +- sbin/reboot/reboot.c | 2 +- sbin/routed/rtquery/rtquery.c | 2 +- sbin/swapon/swapon.c | 2 +- sbin/tunefs/tunefs.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index cbe3d9b08250..1bbae1837c71 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #define REPORT_PERIOD (30*60) static void fake(int); -static void usage(void); +static void usage(void) __dead2; static void fake(int unused __unused) diff --git a/sbin/comcontrol/comcontrol.c b/sbin/comcontrol/comcontrol.c index 98670e1c7ab4..fc7e619c6239 100644 --- a/sbin/comcontrol/comcontrol.c +++ b/sbin/comcontrol/comcontrol.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> -static void usage(void); +static void usage(void) __dead2; static void usage(void) diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 451ee21830d2..30382a56d135 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -258,7 +258,7 @@ static int decimal(const char *str, int *num, int deflt, uint32_t maxval); static int read_config(char *config_file); static void reset_boot(void); static int sanitize_partition(struct dos_partition *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index b30404fba7db..47e26ad8367c 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -50,7 +50,7 @@ #include "ldconfig.h" #include "rtld_paths.h" -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index 0571ab60443d..4cef75aa3df1 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -60,7 +60,7 @@ static struct md_ioctl mdio; static enum {UNSET, ATTACH, DETACH, RESIZE, LIST} action = UNSET; static int nflag; -static void usage(void); +static void usage(void) __dead2; static void md_set_file(const char *); static int md_find(const char *, const char *); static int md_query(const char *, const int, const char *); diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 2dbd27ce2a0f..2e46b50e7d43 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -124,7 +124,7 @@ static char *disktype; static void getfssize(intmax_t *, const char *p, intmax_t, intmax_t); static struct disklabel *getdisklabel(void); -static void usage(void); +static void usage(void) __dead2; static int expand_number_int(const char *buf, int *num); ufs2_daddr_t part_ofs; /* partition offset in blocks, used with files */ diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c index 635e9250a727..1ba399fe447e 100644 --- a/sbin/newfs_msdos/newfs_msdos.c +++ b/sbin/newfs_msdos/newfs_msdos.c @@ -51,7 +51,7 @@ static const char rcsid[] = static u_int argtou(const char *, u_int, u_int, const char *); static off_t argtooff(const char *, const char *); -static void usage(void); +static void usage(void) __dead2; static time_t get_tstamp(const char *b) diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c index b31fef273d39..509f928a2bb8 100644 --- a/sbin/nos-tun/nos-tun.c +++ b/sbin/nos-tun/nos-tun.c @@ -89,7 +89,7 @@ static struct ifreq ifrq; int net; /* socket descriptor */ int tun; /* tunnel descriptor */ -static void usage(void); +static void usage(void) __dead2; static int Set_address(char *addr, struct sockaddr_in *sin) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 118ac304024c..8cae59002b2d 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include <unistd.h> #include <utmpx.h> -static void usage(void); +static void usage(void) __dead2; static u_int get_pageins(void); static int dohalt; diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index 883c51fabc68..a03fc21f68e2 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -131,7 +131,7 @@ static void query_loop(char *argv[], int) __attribute((__noreturn__)); static int getnet(char *, struct netinfo *); static u_int std_mask(u_int); static int parse_quote(char **, const char *, char *, char *, int); -static void usage(void); +static void usage(void) __dead2; int diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 4daa6e8b17ee..d98f63b153d0 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -static void usage(void); +static void usage(void) __dead2; static const char *swap_on_off(const char *, int, char *); static const char *swap_on_off_gbde(const char *, int); static const char *swap_on_off_geli(const char *, char *, int); diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 2355a2a3e33b..4445603dbc90 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -80,7 +80,7 @@ static char clrbuf[MAXBSIZE]; static struct uufsd disk; #define sblock disk.d_fs -static void usage(void); +static void usage(void) __dead2; static void printfs(void); static int journal_alloc(int64_t size); static void journal_clear(void);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307071651.367Gp395010540>