From nobody Fri Jul 7 16:51:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QyKCy56gBz4m3D5; Fri, 7 Jul 2023 16:51:10 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QyKCy4K3Rz4Mdx; Fri, 7 Jul 2023 16:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IOIGQX7AeTxUL/nic20l5CFivye0SWRg/jIP44WN3cg=; b=yasqXRlEJoK8Pxrk3yIi/Npp1pKapK6Trmxf3iXks2aONhrBB15SRktX+TLluhQozKnuKa JNhUXand84EMIF07JkVzi/lEREwtvYdvRVRw4U/cMzyJEAo8F74TPaeJ9F3WBCzVkmKRs0 rHNuTpzodTQprnANVrGQNykZR0wIjJJyyDDQMWCV7t/QWkc0CY47GIu+RVpoPqGuiH8DN+ wLBOidPqKmgMunQ72yvEaKaiFLu+di1BQflGszilkIWC4Iv5gXtKeX3ltJcPegQJwuR260 JSebOz3Rq+2O5lfPqAs8FjA3aligpQK0J7bt6hFl9W9xBA7oLcJ7ACX+le8UIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IOIGQX7AeTxUL/nic20l5CFivye0SWRg/jIP44WN3cg=; b=VGRIQL1aTyvr6R2kW5RljY0Q6/gvQXcZ5o+A0NTeW4qHP7MOVLLGfuXkKw3WBDb6LZ0oBZ bSAPL4J0OR5CUhDzQ+m88ra2LjQ5oEa96NrMvnQo+D1lj1MDNVWrsb2Tec6UsAX2cSC/ik 0DdrkXywPtTYEl7qOta6EYK5P9fOWOvDmLkXdq5WNYBpPiQZuLezKtGFRwxnI+U3fBdNRO KwQ0VAGid3RjOQQFomWg0W2jENs9AR+0M8zl60rVNiNJGrqwmyirFUUAJLpgR266Nfd2Tv pkOgIRoLbB51NRGqNQqZdQ/CTOsDBpbx4jXTaVCJ9D/XKuSow5khG5vLoDInMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688748670; a=rsa-sha256; cv=none; b=w2Iuobh9b3ROug+JKwNoTSHtAwieFTRQBmCck0UPoJUz171xd0X8AakccNNgearO1Qal8x Cfxef3wRUIzZW8XFjTQzWBBF8kKyxXEmsv2sWX3mudD4iw+jeOo/K5q1AIyfaCGm7/ijsx T3EsIJYWBIBMilNvT0uRTF5HdGnJnyzARGMcHDcKLej62CDKpVjcuu+8U4xOlm2uzRzCtp ZlshdMK476oYQOwKRgxrn4rqGYEy/e6a3ATU06ed898vBjFV2SNduUYKRJOvLabQparu4T QR16zp0HEKqqTyaPzlwW9C+1UBzY9IZb6CczxOJatVfnV5MS/eeBD6b0YLiIug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QyKCy3R2vzlyt; Fri, 7 Jul 2023 16:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 367GpAEQ010673; Fri, 7 Jul 2023 16:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367GpAen010672; Fri, 7 Jul 2023 16:51:10 GMT (envelope-from git) Date: Fri, 7 Jul 2023 16:51:10 GMT Message-Id: <202307071651.367GpAen010672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 498a0a9c61c3 - main - Mark usage function as __dead2 in programs where it does not return List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 498a0a9c61c3048b492937ff76d58bbd0b78031a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=498a0a9c61c3048b492937ff76d58bbd0b78031a commit 498a0a9c61c3048b492937ff76d58bbd0b78031a Author: Alfonso Gregory AuthorDate: 2023-07-07 16:39:23 +0000 Commit: Warner Losh CommitDate: 2023-07-07 16:45:18 +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 --- usr.bin/asa/asa.c | 2 +- usr.bin/banner/banner.c | 2 +- usr.bin/biff/biff.c | 2 +- usr.bin/bintrans/uuencode.c | 2 +- usr.bin/brandelf/brandelf.c | 2 +- usr.bin/c99/c99.c | 2 +- usr.bin/chat/chat.c | 2 +- usr.bin/chkey/chkey.c | 2 +- usr.bin/cksum/cksum.c | 2 +- usr.bin/cmp/cmp.c | 2 +- usr.bin/colrm/colrm.c | 2 +- usr.bin/cpuset/cpuset.c | 2 +- usr.bin/ctags/ctags.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c index a6c3d7d7c1e5..4491beeead04 100644 --- a/usr.bin/asa/asa.c +++ b/usr.bin/asa/asa.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include static void asa(FILE *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c index 3d887ae6d4f1..b28c5e440281 100644 --- a/usr.bin/banner/banner.c +++ b/usr.bin/banner/banner.c @@ -1026,7 +1026,7 @@ static char print[DWIDTH]; static int debug, i, j, linen, max, nchars, pc, term, trace, x, y; static int width = DWIDTH; /* -w option: scrunch letters to 80 columns */ -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 70372d57a041..ad238b951366 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c index cb3669dd55d0..a0e1406c3648 100644 --- a/usr.bin/bintrans/uuencode.c +++ b/usr.bin/bintrans/uuencode.c @@ -70,7 +70,7 @@ extern int main_base64_encode(const char *, const char *); static void encode(void); static void base64_encode(void); static int arg_to_col(const char *); -static void usage(void); +static void usage(void) __dead2; static FILE *output; static int mode; diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c index 505bd09f39d7..c95f2aef806e 100644 --- a/usr.bin/brandelf/brandelf.c +++ b/usr.bin/brandelf/brandelf.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); static int elftype(const char *); static const char *iselftype(int); static void printelftypes(void); -static void usage(void); +static void usage(void) __dead2; struct ELFtypes { const char *str; diff --git a/usr.bin/c99/c99.c b/usr.bin/c99/c99.c index deabdf49f02c..a1752e6f4540 100644 --- a/usr.bin/c99/c99.c +++ b/usr.bin/c99/c99.c @@ -50,7 +50,7 @@ static u_int cargs, nargs; static void addarg(const char *); static void addlib(const char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c index 059aa2483292..ec558a615901 100644 --- a/usr.bin/chat/chat.c +++ b/usr.bin/chat/chat.c @@ -145,7 +145,7 @@ static int say_next, hup_next; void *dup_mem(void *b, size_t c); void *copy_of(char *s); -static void usage(void); +static void usage(void) __dead2; void chat_logf(const char *fmt, ...); void fatal(int code, const char *fmt, ...); SIGTYPE sigalrm(int signo); diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c index 4751a284b384..55d34bcc0fc3 100644 --- a/usr.bin/chkey/chkey.c +++ b/usr.bin/chkey/chkey.c @@ -74,7 +74,7 @@ static char PKFILE[] = "/etc/publickey"; #endif /* YP */ static char ROOTKEY[] = "/etc/.rootkey"; -static void usage(void); +static void usage(void) __dead2; extern int yp_update(char *, char *, int, char *, size_t, char *, size_t); int diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c index 5da560582366..6634bd1903d0 100644 --- a/usr.bin/cksum/cksum.c +++ b/usr.bin/cksum/cksum.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); #include "extern.h" -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv) diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 82f34803fc22..a71565760a83 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -86,7 +86,7 @@ siginfo(int signo) } #endif -static void usage(void); +static void usage(void) __dead2; static bool parse_iskipspec(char *spec, off_t *skip1, off_t *skip2) diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index a0969281dd14..739b184b6e6c 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); #define TAB 8 void check(FILE *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/usr.bin/cpuset/cpuset.c b/usr.bin/cpuset/cpuset.c index 1dee12b06ec3..43aadb33f1e0 100644 --- a/usr.bin/cpuset/cpuset.c +++ b/usr.bin/cpuset/cpuset.c @@ -69,7 +69,7 @@ static id_t id; static cpulevel_t level; static cpuwhich_t which; -static void usage(void); +static void usage(void) __dead2; struct numa_policy { const char *name; diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index d94b6e87ae1b..9b5139f08be1 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -87,7 +87,7 @@ char lbuf[LINE_MAX]; void init(void); void find_entries(char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char **argv)