From nobody Tue Nov 18 16:24:41 2025 X-Original-To: dev-commits-src-all@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 4d9qhB04Jlz6HNfN for ; Tue, 18 Nov 2025 16:24:42 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qh968Nsz4JTj for ; Tue, 18 Nov 2025 16:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483081; 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=SLAhX3Sddx4ErnhIqfO8pxbEFis9qqllsdrpglX4RTs=; b=Fb8dAEqDKAu4/Ogom2dFgedRJs1NSd3P8kYVNQ1xz4Sqfdu1KcC/MfbtWqAXC1V8TTVGyT 9wRvEC+ATG5t5S0KVrnFard524yT/sRAKcnU1cBeprN7+LniImgx1qg7ms9xrvEuN2RYml X+MwBmkYZnKxy2fxoCzqaz5znXF9KsamUGyoeIkVi4k/c45ZmDDAqlOcPczM1EuWSGbooR qvV1vzrU9hpBRhsdWpp7lCPd2QLNGYHg2hLvqdF8BHBZWVvFIJSpRjtsQ9EPqvPGIYvwbY bw2A46dN1Uo7BMAPt9A+GW3uVnCqCstb56rgokHHLpvWooX/GsJRvbV40w0uSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483081; 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=SLAhX3Sddx4ErnhIqfO8pxbEFis9qqllsdrpglX4RTs=; b=IbyB60m4JmoWVk5gN22nbyca6YnXZkx0ImWlJwenLQbEjtFl+tpw3MiExUmxfMFXA82Qkb VOAkZUSBQFG/7MrcokGTc1mUYaYMR/h30KggGAlqiInQztV/P4wna6KdY2CQeAWeNSsdIx qZWPWcNHXP5Y8Nz6pteDsJezXkh9O5UloSmacf4yxCVZ7zBA7aeO3ZOQxJhUXlFntl3dzn NyiC5Z20aG5xinAtKfJie9p29rPCK6dEQLX8t2EpQl+9U28u7p9U38PlKKnPwXy2nXjDCg Xw9o2uiXpNkRrKNNKWC0ulzIopBh5IivvebbNivh+/rdeMc4BGoWeS8iHDKvuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483081; a=rsa-sha256; cv=none; b=Opllh6osWIkY9lP3TrVyIL2aQO260by9zB5F0OBR6Rc9Vt8b9YJ570VrjYQ3oG0dxV/BPk SJGv34KyHe5alSwSKMProzimvqrANDGhCtjOF2OxMF0Qv9pmR3wH2baLt6sLFDQiiRcaGR My453b9fnwlXIquklcNU89tJX7s3b854QPfZtgLJPUJ2gyYccEOyGZPg3MIZzBSLu9/74d UKEoxhZ56wmE24N0Y2MxUiY0M2qHBq1ZGm7v9kUJhzkGHdy8D6NuN71xqPFN3TMsLp8y8l lMks44e0uv8b5kppxmZawVYVAMWrRejlT3VXQv/+ILED2zTIzpUNq9Osl6weBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qh95cpXz11sk for ; Tue, 18 Nov 2025 16:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e5d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a9be8f996819 - main - setaudit: Bump WARNS and fix some style bugs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9be8f9968198600eefcd1b4423a29ea2016e020 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:41 +0000 Message-Id: <691c9dc9.3e5d3.7fe75e29@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a9be8f9968198600eefcd1b4423a29ea2016e020 commit a9be8f9968198600eefcd1b4423a29ea2016e020 Author: Mark Johnston AuthorDate: 2025-11-17 16:40:57 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:20 +0000 setaudit: Bump WARNS and fix some style bugs - Cast sockaddrs through void to silence warnings about expected alignment. - Fix cast style. - Sort includes. - Make some global variables local. - Sort options. No functional change intended. Reviewed by: csjp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53670 --- usr.sbin/setaudit/Makefile | 2 -- usr.sbin/setaudit/setaudit.c | 34 ++++++++++++++++------------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/usr.sbin/setaudit/Makefile b/usr.sbin/setaudit/Makefile index a2e8b37c5c30..548780f4cd03 100644 --- a/usr.sbin/setaudit/Makefile +++ b/usr.sbin/setaudit/Makefile @@ -1,8 +1,6 @@ PROG= setaudit MAN= setaudit.8 -WARNS?= 3 - LIBADD+= bsm .include diff --git a/usr.sbin/setaudit/setaudit.c b/usr.sbin/setaudit/setaudit.c index cfe8f2bc7155..bdf33ab4cf3d 100644 --- a/usr.sbin/setaudit/setaudit.c +++ b/usr.sbin/setaudit/setaudit.c @@ -23,6 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include #include @@ -31,23 +32,18 @@ #include -#include +#include +#include #include +#include +#include #include #include -#include -#include -#include - -static char *aflag; -static char *mflag; -static char *sflag; static void usage(char *prog) { - - (void) fprintf(stderr, + (void)fprintf(stderr, "usage: %s [-46] [-a auid] [-m mask] [-s source] [-p port] command ...\n", prog); exit(1); @@ -62,15 +58,17 @@ main(int argc, char *argv []) auditinfo_addr_t aia; struct addrinfo *res; struct passwd *pwd; - char *r, *prog; + char *aflag, *mflag, *sflag, *r, *prog; int ch, error; + aflag = mflag = sflag = NULL; + prog = argv[0]; bzero(&aia, sizeof(aia)); bzero(&hints, sizeof(hints)); aia.ai_termid.at_type = AU_IPv4; hints.ai_family = PF_UNSPEC; - while ((ch = getopt(argc, argv, "46a:m:s:p:")) != -1) + while ((ch = getopt(argc, argv, "46a:m:p:s:")) != -1) switch (ch) { case '4': hints.ai_family = PF_INET; @@ -84,12 +82,12 @@ main(int argc, char *argv []) case 'm': mflag = optarg; break; - case 's': - sflag = optarg; - break; case 'p': aia.ai_termid.at_port = htons(atoi(optarg)); break; + case 's': + sflag = optarg; + break; default: usage(prog); /* NOT REACHED */ @@ -117,14 +115,14 @@ main(int argc, char *argv []) errx(1, "%s", gai_strerror(error)); switch (res->ai_family) { case PF_INET6: - sin6 = (struct sockaddr_in6 *) res->ai_addr; + sin6 = (struct sockaddr_in6 *)(void *)res->ai_addr; bcopy(&sin6->sin6_addr.s6_addr, &aia.ai_termid.at_addr[0], sizeof(struct in6_addr)); aia.ai_termid.at_type = AU_IPv6; break; case PF_INET: - sin = (struct sockaddr_in *) res->ai_addr; + sin = (struct sockaddr_in *)(void *)res->ai_addr; bcopy(&sin->sin_addr.s_addr, &aia.ai_termid.at_addr[0], sizeof(struct in_addr)); @@ -135,6 +133,6 @@ main(int argc, char *argv []) if (setaudit_addr(&aia, sizeof(aia)) < 0) { err(1, "setaudit_addr"); } - (void) execvp(*argv, argv); + (void)execvp(*argv, argv); err(1, "%s", *argv); }