From nobody Fri Jul 7 16:51:02 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 4QyKCp60Kyz4m3Hs; Fri, 7 Jul 2023 16:51:02 +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 4QyKCp5D5gz4MMP; Fri, 7 Jul 2023 16:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748662; 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=LcyupHa92BMsZz7Eed+Y/vQ+KL/vlCKNUnOyDzIXA1Y=; b=QpoLNC74WW0NemyvOV/lGSWFl35847+OikYvInIih2ZQR8LFXOMv3UKKXYhi1zU3qNcHeJ H/IdM2Zywfi1Rx8tcIyCHVbW64ZqoeSwjPFfixPLEuxMgB5RrKgRLjMJzRixC++sgk2Szi awy8k6GbfKkzoINlWN10oTBQXGjgtsXXGIEkLRQKSisfD6OqecoDMrIs9oev8yiDxloWVt dyBAmg4qA2pgItdzdxA/FDRwBaRCzVRXxdwSVd0jTNr3UiqmEPDJY5uZkA69uqyCrdNQ0g Q6i5UXWp8hC6ghYFxceT/rvlB6LqXdfbdnqrtmj/9eGGs7kI11ikwCMlPfeemQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748662; 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=LcyupHa92BMsZz7Eed+Y/vQ+KL/vlCKNUnOyDzIXA1Y=; b=TRF2xMue4EpC3Ulg4dLZxJFhDPhgISJdOicxFFwLNwEduT+JDuJvTAch4uP+U/eJvgEVCb 19h1pSkqUc1kzcGfm6Q3FkxyuTk7l9N6fOReirebwsLa/dt4Bt+A2tonvf1gEDLtc24aFy aZoTGY4E5byaT9b8sOhUKxwVjgQ+7tM4aNlhfc2hwsNLbjaCdM3JEHM/xne7EQ9MxvxaJ4 XqSv8v7oIkf5fetAuPI0fa0SNtNDRpIPcsHO1+cXwuC+yIRJCo2mhxFVrK2NnVDjoAer/+ ruU9XjPCR9X7qYAhUFhXlkLrehkQUsUaV7TvZx4K6k3M3MfE963m5FZtMD4tyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688748662; a=rsa-sha256; cv=none; b=GSddQ4pJ8VIUMTetHKjoJ1UBeLJzOD5PJPvV4Ho2YGu63PJMD+dkVohXIMJ/uJPNnjmaKs YoCB/96MmkYLwaZ5HI7HAunVrOotE+AJnGmMw/08SxUIiWyHBVTKu0tdE5zBUURXFMd9ob hlr1ydaWRdIyIhlNkJvCchrQJiQR52xbJ783ENnqBR1ZmnIe0Fq2wz1f0jLmrdwgjxiuol /ckxJex7Af4r7OamOrmlir/ibLx2As62OEbgtjOlpgGUt5IHGCtUxdI89bctLaU2zjT7iW 9rtYo+4K7YDvK5dqKDnWa2kt471YS/3fCUXJDVSQcA6KiepRrDK4Fbc/bFL2rQ== 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 4QyKCp43FBzmFy; Fri, 7 Jul 2023 16:51:02 +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 367Gp21T010521; Fri, 7 Jul 2023 16:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367Gp2c8010520; Fri, 7 Jul 2023 16:51:02 GMT (envelope-from git) Date: Fri, 7 Jul 2023 16:51:02 GMT Message-Id: <202307071651.367Gp2c8010520@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: 69c0fb2a7a6f - 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: 69c0fb2a7a6f8145102f3ef370410fc380735e1c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=69c0fb2a7a6f8145102f3ef370410fc380735e1c commit 69c0fb2a7a6f8145102f3ef370410fc380735e1c 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 --- libexec/atrun/atrun.c | 2 +- libexec/bootpd/bootpgw/bootpgw.c | 2 +- libexec/bootpd/tools/bootpef/bootpef.c | 2 +- libexec/rbootd/rbootd.c | 2 +- libexec/rpc.rwalld/rwalld.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c index 78d4ab32157b..e9e49146ba7a 100644 --- a/libexec/atrun/atrun.c +++ b/libexec/atrun/atrun.c @@ -96,7 +96,7 @@ static int debug = 0; void perr(const char *fmt, ...); void perrx(const char *fmt, ...); -static void usage(void); +static void usage(void) __dead2; /* Local functions */ static int diff --git a/libexec/bootpd/bootpgw/bootpgw.c b/libexec/bootpd/bootpgw/bootpgw.c index c0042ccb1de3..1aab5e7f6f50 100644 --- a/libexec/bootpd/bootpgw/bootpgw.c +++ b/libexec/bootpd/bootpgw/bootpgw.c @@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$"); * Externals, forward declarations, and global variables */ -static void usage(void); +static void usage(void) __dead2; static void handle_reply(void); static void handle_request(void); diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c index 2fb928f3065d..51e5e581f7d7 100644 --- a/libexec/bootpd/tools/bootpef/bootpef.c +++ b/libexec/bootpd/tools/bootpef/bootpef.c @@ -78,7 +78,7 @@ SOFTWARE. */ static void mktagfile(struct host *); -static void usage(void); +static void usage(void) __dead2; /* * General diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c index 9e1c8e0bda76..6afceae050ab 100644 --- a/libexec/rbootd/rbootd.c +++ b/libexec/rbootd/rbootd.c @@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$"); #include #include "defs.h" -static void usage(void); +static void usage(void) __dead2; int main(int argc, char *argv[]) diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index adde226cfba8..d1167219bd26 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); void wallprog_1(struct svc_req *rqstp, SVCXPRT *transp); void possess(void); void killkids(int sig); -static void usage(void); +static void usage(void) __dead2; int nodaemon = 0; int from_inetd = 1;