From nobody Mon Dec 8 14:17:42 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 4dQ3wQ3Hw4z6JsSP for ; Mon, 08 Dec 2025 14:17: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 4dQ3wQ0g6Sz3q4Y for ; Mon, 08 Dec 2025 14:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203462; 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=geyE32tawLC4sSiU0zVzMMYbZSv7eI5H/NH8EknGjxI=; b=uzlUAJzlKD01H5zoS16JJaZdpIn/2XdmrXsJqxvix28cpcIjA+RbjtGNNfBLZq7SLrePoF rPgwxTlFr5c79s+cooXANL4RoqZ2bnPE1/p9Nt6IGslB/Px1kOML+H9Fp/l4Zo2Gr+GgJu eTy9x39UqquVoh6WdzWfFzSZ/a/Uw0E4uo0oai3+k+sQQ7IVXBpwBK5najIvwd3s/fI3Jp QNa3lXRlSGpgr/2YWnENislmQD/I8yXiscIthoHzv7Uj4n4rI2OYzvL0Yl4qUGGTqogDxJ UkUWsRV93KBO94jXq2YLiAStdYm1UtSTEvbyXrFqLYITaEVDmTg1MXzSkBF2+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203462; 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=geyE32tawLC4sSiU0zVzMMYbZSv7eI5H/NH8EknGjxI=; b=svPGyl03VzlGH4HygYHhJvzJTX9z2ZAb4/eUL+INvuPJaQiWN5yMVqfPqGclq4SFw29wM3 kfOq3gZdlrDjs7ol/+F3u18K0EqxX7id0mGo3s2wVrrBia8Fsk7zH5gXD9kKLr9bxzriWw yjt+9kjDQpAJUShAiqWK9UV621XX5GEdqIp+izAOCx+iPAEjGoP2LRB2gsmr6KX4yTZkOG 7GCkNX87snCR/maDOJxyt0fOrjjMWqqtrM2ENZLp+nw0HbCEf9kVeTt9B+JMwa+MwqphLF xbtQs9GYc7UerUJltD4WKeHmtmEBTU0qSPeiJN6Cq2Lx6EZ8tlNahQTNiPS5YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765203462; a=rsa-sha256; cv=none; b=rMqsnwjlpIyQhUBVO9mtqyWGrJK2hI2F/uiCCw9Nm/Ffugm1oQxXBDI4ZQyIcdb8zySr1B O+eNXkOjerNEjr8QlxoJhiKeDJzeyxGbG8onrnillUXFE/lAU2APnWAf4s7QC1SLaPtYoD 95SICTsOKv2mr+yXwpkhNpDLvdBlhFqp3JCmnpQCK9jg4YMmVIyoLYwvVbTHj34W5JGDz6 XmZgiJjrcROxGHLBqmjiMByg3FKq68SOQYPr4GXT421vWTymNNlSfQH9EOCLzNw+IFxqcO sZo5e/ZEHW6NWOK6P3Ce2oH4VrTASsTL17YKSbBcEsK2ZX5s1PDYBHEThq4lpA== 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 4dQ3wQ09chz1N7 for ; Mon, 08 Dec 2025 14:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2f13b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 14:17:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6addb7cec0f3 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6addb7cec0f3d862377320ba7bf7b13e012a8ecc Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 14:17:42 +0000 Message-Id: <6936de06.2f13b.7319bac9@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6addb7cec0f3d862377320ba7bf7b13e012a8ecc commit 6addb7cec0f3d862377320ba7bf7b13e012a8ecc Author: Mark Johnston AuthorDate: 2025-11-17 16:40:57 +0000 Commit: Mark Johnston CommitDate: 2025-12-08 14:14:58 +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 (cherry picked from commit a9be8f9968198600eefcd1b4423a29ea2016e020) --- 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); }