From nobody Mon Jul 27 23:11:02 2026 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 4h8DqC3T6dz6m29F for ; Mon, 27 Jul 2026 23:11:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8DqC0wLzz3L08 for ; Mon, 27 Jul 2026 23:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785193863; 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=gCLpD720Be5PeBDzvTjGZ1X6C+lLxwAHC+yKs9OS/34=; b=nTmmzUNr3El1oKfrRMuB750CMWQuymeg5IQpGfbtgd5k0KBl36AX5xijxsxtr2evxDicPr t6JaURdLF7dKV1ve1qX0jn7wHtMCIuClut51p7NWxxdhYT6G85LFWy6qX238G4bEpKXIqm 83NmUtNVfNcPa/QNbQEs9tQ6hlgm0PQgQeOvCImwarsJx+yhmhs2kLBKRk1m8uOqe7d7TI 3xuJhGPzRiKPyqdc911HY19UQ0Wl6KMTNd31BgtavFKz4sJupX6BSlKCwjjb0GPE1CGgdS K9yZuf3o1bAHOkXCeJhQT9dNk4dHDAdd5Q6HMa74GW6gpZPd2g1WV2StLJQuuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785193863; a=rsa-sha256; cv=none; b=VkuhA5ngJjsndqNAME9oSUcBTLuW+eqjVdBMK9beE4fjBBJkAhgW7UNi+HWU2L0ECcmEpS 9Yd+iwxnOubDljM80xU0pY/icBU3PBXMBOFcD1FWpDvQnHD7MV2LOrFumFTFvyniNmzWoJ 5c3AufiHNmw2oPfRDhTzOtNaqCytoi/rZu8U1zuE+S05xvsS+7ewLCYijvHBtIYt5sPv5h dZo/7G8/kdPPOfe87RTPo3G5q03pK7j8GH7Fn8yc8ao45J4VhQcQF87e2L1ezXDNKqovRh Li9cZToKhjDub1GnrpA2bMitNNW54WBMTI9cQeh3joRs/dzP5lo5CBJcRFk7Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785193863; 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=gCLpD720Be5PeBDzvTjGZ1X6C+lLxwAHC+yKs9OS/34=; b=KfevXiwuhxR5OCTELHc2d9YA+sui21SODU0FOrpCudw8uvcFhF+QYxC8oN9IVUWPFEvjZ1 OMLuGxVKXuv09l+5SbMOF7ikKtTwfXrdkVFtUYkHfpvA/Xx98LdGbrE5yOabQ2oWR+afid KGOnDepIic4wWCPoV53yA18KniFpeTXAqmwuT2U2lydLbjVBJncWZbDaOcZm0uyGkOG+6W I2/9P5YlfP21Dck7dy/cFdaNONFYFBaTi16vuMkCRzYep5pIAnlmNdKPOkPn7z/vx0lU9x HH3pcGRqQ8Jw1siCP4D+IBtkxJ3Pg1cCLBWrrv08tXsTydMiOa578SDbMS0ZRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8DqB6tpxz1SQY for ; Mon, 27 Jul 2026 23:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3260d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 23:11:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 95a3301ce144 - main - rpcinfo: Fix residual warnings and bump WARNS 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 95a3301ce144aecce5de88fb4e2905c440533fb8 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 23:11:02 +0000 Message-Id: <6a67e586.3260d.1cfd298@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95a3301ce144aecce5de88fb4e2905c440533fb8 commit 95a3301ce144aecce5de88fb4e2905c440533fb8 Author: Mark Johnston AuthorDate: 2026-07-27 19:00:49 +0000 Commit: Mark Johnston CommitDate: 2026-07-27 23:03:16 +0000 rpcinfo: Fix residual warnings and bump WARNS Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58442 --- usr.bin/rpcinfo/Makefile | 2 -- usr.bin/rpcinfo/rpcinfo.c | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile index a55485e4f718..ffe593401397 100644 --- a/usr.bin/rpcinfo/Makefile +++ b/usr.bin/rpcinfo/Makefile @@ -4,6 +4,4 @@ MAN= rpcinfo.8 CFLAGS+= -DPORTMAP -WARNS?= 2 - .include diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index 70d632fb9227..15c4ca4721b1 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -79,7 +79,7 @@ #define MAXHOSTLEN 256 #define MIN_VERS ((u_long) 0) #define MAX_VERS ((u_long) 4294967295UL) -#define UNKNOWN "unknown" +static char unknown[] = "unknown"; /* * Functions to be performed. @@ -103,7 +103,7 @@ struct netidlist { }; struct verslist { - int vers; + rpcvers_t vers; struct verslist *next; }; @@ -145,8 +145,8 @@ static void print_getaddrstat(int, rpcb_stat *); static void usage(void); static u_long getprognum(char *); static u_long getvers(char *); -static char *spaces(int); -static bool_t add_version(struct rpcbdump_short *, u_long); +static const char *spaces(size_t); +static bool_t add_version(struct rpcbdump_short *, rpcvers_t); static bool_t add_netid(struct rpcbdump_short *, char *); int @@ -597,13 +597,13 @@ reply_proc(char *res __unused, const struct netbuf *who, struct sockaddr *sa = (struct sockaddr *)who->buf; if (getnameinfo(sa, sa->sa_len, hostbuf, NI_MAXHOST, NULL, 0, 0)) { - hostname = UNKNOWN; + hostname = unknown; } else { hostname = hostbuf; } uaddr = taddr2uaddr(nconf, who); if (uaddr == NULL) { - printf("%s\t%s\n", UNKNOWN, hostname); + printf("%s\t%s\n", unknown, hostname); } else { printf("%s\t%s\n", uaddr, hostname); free((char *)uaddr); @@ -630,7 +630,7 @@ brdcst(int argc, char **argv) } static bool_t -add_version(struct rpcbdump_short *rs, u_long vers) +add_version(struct rpcbdump_short *rs, rpcvers_t vers) { struct verslist *vl; @@ -769,7 +769,7 @@ rpcbdump(int dumptype, char *netid, int argc, char **argv) } if (list->rpcb_map.r_netid == NULL) goto error; - list->rpcb_map.r_owner = UNKNOWN; + list->rpcb_map.r_owner = unknown; low = pmaphead->pml_map.pm_port & 0xff; high = (pmaphead->pml_map.pm_port >> 8) & 0xff; (void)asprintf(&list->rpcb_map.r_addr, @@ -977,7 +977,8 @@ rpcbgetstat(int argc, char **argv) struct timeval minutetimeout; register CLIENT *client; char *host; - int i, j; + unsigned int i; + int j; rpcbs_addrlist *pa; rpcbs_rmtcalllist *pr; int cnt, flen; @@ -1653,7 +1654,7 @@ print_rmtcallstat(int rtype, rpcb_stat *infp) } static void -print_getaddrstat(int rtype, rpcb_stat *infp) +print_getaddrstat(int rtype __unused, rpcb_stat *infp) { rpcbs_addrlist_ptr al; register struct rpcent *rpc; @@ -1671,14 +1672,14 @@ print_getaddrstat(int rtype, rpcb_stat *infp) } } -static char * -spaces(int howmany) +static const char * +spaces(size_t howmany) { static char space_array[] = /* 64 spaces */ " "; - if (howmany <= 0 || howmany > sizeof (space_array)) { + if (howmany >= sizeof(space_array)) { return (""); } - return (&space_array[sizeof (space_array) - howmany - 1]); + return (&space_array[sizeof(space_array) - howmany - 1]); }