From nobody Fri Jul 7 16:51:01 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 4QyKCn4nnJz4m3G3; Fri, 7 Jul 2023 16:51:01 +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 4QyKCn4Nlrz4Lx9; Fri, 7 Jul 2023 16:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748661; 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=HP86PQLZDF96NmohtFPKcv/M8GWRnW695dFRW2+BJy4=; b=O0HYAem7FbrHv4eVcKNlmJXyuMYGNI0wdjQ3kAa39alE4fGgZ4wTb9gE/qLOPtLxFSWQ8h sj1R115+vTfbkf1ev3KU1kQS8ah9l57GVQjwPFbwkPbedFDIlwzWe7BF+g59zcrpQeOcjv ysA58BMytUelckfIdWRIxa35zDrLaFtecNclFKOtRuVP1bQa4Sym0IigiE8n6bacKHKBmf jTwi+h4KYWzobAW+AEqydR93DU5y3FCq0a2P1vRI5HCJM/I6s4CoSpoc0Ssex9Y/tMp+7B cHWyqPX/P/TaYFRrV8ruw/pU9M415sWEdRWzoeCs6oM/pNFaOYfcTRfTXndckQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748661; 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=HP86PQLZDF96NmohtFPKcv/M8GWRnW695dFRW2+BJy4=; b=I2N7JV/ZVWBFrw/3qwbbuBvUu/Pmg4E3DxeOEUrq9HAkrhJDylmyclyezaHRNDrwM+teQ2 ug5QlB6Ayifh86u6nHHYjRVGh5zJWsE2IvCynFGIpdL+75INhbFzUiLdwKnj1zVGK6WN25 Oxj97UwQTMOg+S6yJgk9v/oqmCTggKwBu4ed/OWulZNPteLBcpqa+xQv9LdcTa6Zwc+p9L vsf3Q5QyA1c7IR8N50RpVcXr9KyUh5B7nTIbFk7tw3YfaiFDus+0GvoIIqlo5kDs7hIRv8 e2ymJ5O1ai2nHzhZyg70R3KkyvK3AyX12GYnCGLwV03lPzFSW2YgS+2Bf9JaZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688748661; a=rsa-sha256; cv=none; b=Fn4dbvEhZq36aeDpwkQ0y/8RQcnrin0bbTog2d/59yJgnSr1bN4X07qGv+CsZeqlkt0Z0D 7mOu3M6iK9lp0LGDweIjD0r/CAUM6luVLMNsdEYR3LcG5I92K4j1XoSKaKEp4FPDLOq45N iwP2dVOLmOTWuP76c9exio40w5yn5sm7d66N8y4TzL7pWuM64vG0UmAQUA92K+T+qknfrf CboSuYoEQz5hnrXAzty9HEe1eW2EwOhjvsdQyHN1cRH4rdUui4+3RrICKFjcnQfioaL5Gb YHImI/YDzXWB9son8brxKR+DgoZ0LkHqSmwSj9qjPqLNV1j7e2Zk4Vr7o4tUxQ== 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 4QyKCn38LlzmFw; Fri, 7 Jul 2023 16:51:01 +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 367Gp1Dp010502; Fri, 7 Jul 2023 16:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367Gp1bA010501; Fri, 7 Jul 2023 16:51:01 GMT (envelope-from git) Date: Fri, 7 Jul 2023 16:51:01 GMT Message-Id: <202307071651.367Gp1bA010501@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: e97468063d6f - 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: e97468063d6f9274b885739a9bcb5be7fffc9598 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e97468063d6f9274b885739a9bcb5be7fffc9598 commit e97468063d6f9274b885739a9bcb5be7fffc9598 Author: Alfonso Gregory AuthorDate: 2023-07-07 16:39:23 +0000 Commit: Warner Losh 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 --- bin/chflags/chflags.c | 2 +- bin/chio/chio.c | 2 +- bin/chmod/chmod.c | 2 +- bin/cp/extern.h | 2 +- bin/date/date.c | 4 ++-- bin/domainname/domainname.c | 2 +- bin/kill/kill.c | 2 +- bin/rmdir/rmdir.c | 2 +- bin/sleep/sleep.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index 55dedfce53f1..5c45085624a1 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); static volatile sig_atomic_t siginfo; -static void usage(void); +static void usage(void) __dead2; static void siginfo_handler(int sig __unused) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index da9e4696588b..2a7ce706afd7 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include "defs.h" #include "pathnames.h" -static void usage(void); +static void usage(void) __dead2; static void cleanup(void); static u_int16_t parse_element_type(char *); static u_int16_t parse_element_unit(char *); diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index e8657af0d97b..cd02c4fa810d 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); static volatile sig_atomic_t siginfo; -static void usage(void); +static void usage(void) __dead2; static int may_have_nfs4acl(const FTSENT *ent, int hflag); static void diff --git a/bin/cp/extern.h b/bin/cp/extern.h index 65360ccaf6c1..f42315f07390 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -50,5 +50,5 @@ int copy_special(struct stat *, int); int setfile(struct stat *, int); int preserve_dir_acls(struct stat *, char *, char *); int preserve_fd_acls(int, int); -void usage(void); +void usage(void) __dead2; __END_DECLS diff --git a/bin/date/date.c b/bin/date/date.c index c1fb496ce7ee..b7841030864c 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -68,12 +68,12 @@ __FBSDID("$FreeBSD$"); static time_t tval; static void badformat(void); -static void iso8601_usage(const char *); +static void iso8601_usage(const char *) __dead2; static void multipleformats(void); static void printdate(const char *); static void printisodate(struct tm *); static void setthetime(const char *, const char *, int); -static void usage(void); +static void usage(void) __dead2; static const struct iso8601_fmt { const char *refname; diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index cd14778221c3..cb42990315b6 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.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/bin/kill/kill.c b/bin/kill/kill.c index 201ab9aaf3e9..4ff7a8b19f9f 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); static void nosig(const char *); static void printsignals(FILE *); static int signame_to_signum(const char *); -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 22f1141e14ec..6f1545e40217 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include static int rm_path(char *); -static void usage(void); +static void usage(void) __dead2; static int pflag; static int vflag; diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 55e0aba9871a..5c9e7b17b9d9 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include -static void usage(void); +static void usage(void) __dead2; static volatile sig_atomic_t report_requested; static void