From nobody Sat Oct 10 06:45:15 2026 X-Original-To: dev-commits-src-branches@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 4j1vP817dnz6k2nY for ; Sat, 10 Oct 2026 06:45:16 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j1vP76nDlz3PL0 for ; Sat, 10 Oct 2026 06:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791614716; 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=2OLAxW8Zw8vWXXFoMsMHw7+uIU+8oBrep73EQZ5NKPU=; b=BDL3vhl3MYNYsdYzahUg2K1gj6zym72gGtlpKuwyGnKTnxjnGe8gwusyE/HsKSxomToscT arUhAiS3syBecm1QxHrSt3u3Gxzb+QhM/PrHGELgWwguKvyAoU5rj+cG7S5YjbbHerYsyA cMVx1tYLUWphVy0cEA7TliW5zft7mZJwbaTpj+BuW+68kdHpmWNg3jXApHawPz4gL566VG TPjAnpcaUGWJ4iedxhiRQj7GSolA6auslg0xZhE4QtBtN7cIWHUMjU9Q6o3DH8snU2GoSF lfAfu/9d0RhUxHsVcoVg7tNHONhcBNoqHgt6dWPGxCOi3rzl4hpfii3v7yPP5A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791614716; b=M4/H8XazQcCmMicjji5SyQUXBMFXhkxmE198zujDqYtscrXygGR/m1M1RISI/Ux4SvV8ho 2pTzectvcliPKCOoYp2wpncpllsEUMHxBReENb+0ecT86ObKhXpm1i9JYcQUP2KhpwWo/D irTS+RB2S3ikY41hBQ7iVfBfQ5jrQbIqG58p3aOyIun7Z0X3YBSx0vFk/w/Ds4mQHnEeOB HZ97ozPigpQ0wPoS03GJP2uEJpnXBPQ9ixCfzW8JZZVRW//C/6Hf3fS3PNkc6DWItt1WBm YvcAUyXMGm+h00kgJt2plCuXSehW+Qx3g8ZqtDH4SZF05f2dB4eZK9KQJbhV7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791614716; 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=2OLAxW8Zw8vWXXFoMsMHw7+uIU+8oBrep73EQZ5NKPU=; b=mrRYV/iae5sjHgPi1RxXSYjVtkVSa/Z6/5HdkHxhhcm6n6QqldxCz6avvYQanbF951g7IW HD/tWUjOKgbIqfChDBn2atBEGhwp30DLie6WUyFeMureFdiz6rP8tRW0elrf8ltCEBGCgx VGQUH3OIHlCcsjKdkID4lXzcD8G8BVGI5F3hn376xVqV/jRrl5KM/wBKDMs6i5/bNDN0el Fx776n8goXg2uqFdXzANg/eZch4axHAM6qTCSLUM/Ga1cZCPKcZZtFhZVLXi2Isi0Dw/9/ 06EHOltOCHXDYpAti1fD6+pjuRmK9/4Brtq4JP4Z1CoNB+63kH5fa1Cdzkm4Pw== 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 4j1vP75r3Xzmmr for ; Sat, 10 Oct 2026 06:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30146 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 06:45:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 179dfe41bcfe - stable/15 - lib80211: fix build with eXpat 2.9.0 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: philip X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 179dfe41bcfe65a98b4cd4aa970764f95c6a0bd8 Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 06:45:15 +0000 Message-Id: <6ac9defb.30146.671538da@gitrepo.freebsd.org> The branch stable/15 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=179dfe41bcfe65a98b4cd4aa970764f95c6a0bd8 commit 179dfe41bcfe65a98b4cd4aa970764f95c6a0bd8 Author: Philip Paeps AuthorDate: 2026-10-06 03:14:03 +0000 Commit: Philip Paeps CommitDate: 2026-10-10 02:43:40 +0000 lib80211: fix build with eXpat 2.9.0 eXpat 2.9.0 deprecates XML_GetCurrentLineNumber() in favour of XML_GetCurrentLineNumber64(). The new function behaves the same as the old one but is not prone to 32 bit integer wrap-around. (cherry picked from commit 657c089950a0388811c7ba3f6d3e7127c297864e) --- lib/lib80211/lib80211_regdomain.c | 53 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/lib/lib80211/lib80211_regdomain.c b/lib/lib80211/lib80211_regdomain.c index db353a69f4d9..1e7b001dbbf4 100644 --- a/lib/lib80211/lib80211_regdomain.c +++ b/lib/lib80211/lib80211_regdomain.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -106,8 +107,8 @@ start_element(void *data, const char *name, const char **attr) } if (iseq(name, "netband") && mt->curband == NULL && mt->rd != NULL) { if (mode == NULL) { - warnx("no mode for netband at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("no mode for netband at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); return; } if (iseq(mode, "11b")) @@ -125,15 +126,15 @@ start_element(void *data, const char *name, const char **attr) else if (iseq(mode, "11acg")) mt->curband = &mt->rd->bands_11acg; else - warnx("unknown mode \"%s\" at line %ld", + warnx("unknown mode \"%s\" at line %" PRIu64, __DECONST(char *, mode), - XML_GetCurrentLineNumber(mt->parser)); + XML_GetCurrentLineNumber64(mt->parser)); return; } if (iseq(name, "band") && mt->netband == NULL) { if (mt->curband == NULL) { - warnx("band without enclosing netband at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("band without enclosing netband at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); return; } mt->netband = calloc(1, sizeof(struct netband)); @@ -143,8 +144,8 @@ start_element(void *data, const char *name, const char **attr) if (iseq(name, "freqband") && mt->freqband == NULL && mt->netband != NULL) { /* XXX handle inlines and merge into table? */ if (mt->netband->band != NULL) { - warnx("duplicate freqband at line %ld ignored", - XML_GetCurrentLineNumber(mt->parser)); + warnx("duplicate freqband at line %" PRIu64 " ignored", + XML_GetCurrentLineNumber64(mt->parser)); /* XXX complain */ } else mt->netband->band = (void *)strdup(ref); @@ -227,8 +228,8 @@ decode_flag(struct mystate *mt, const char *p, int len) for (i = 0; i < nitems(flags); i++) if (len == flags[i].len && iseq(p, flags[i].name)) return flags[i].value; - warnx("unknown flag \"%.*s\" at line %ld ignored", - len, p, XML_GetCurrentLineNumber(mt->parser)); + warnx("unknown flag \"%.*s\" at line %" PRIu64 " ignored", + len, p, XML_GetCurrentLineNumber64(mt->parser)); return 0; #undef iseq } @@ -269,8 +270,8 @@ end_element(void *data, const char *name) else if (mt->netband != NULL) mt->netband->flags |= decode_flag(mt, p, len); else { - warnx("flags without freqband or netband at line %ld ignored", - XML_GetCurrentLineNumber(mt->parser)); + warnx("flags without freqband or netband at line %" PRIu64 " ignored", + XML_GetCurrentLineNumber64(mt->parser)); } goto done; } @@ -318,8 +319,8 @@ end_element(void *data, const char *name) } if (len != 0) { - warnx("unexpected XML token \"%s\" data \"%s\" at line %ld", - name, p, XML_GetCurrentLineNumber(mt->parser)); + warnx("unexpected XML token \"%s\" data \"%s\" at line %" PRIu64, + name, p, XML_GetCurrentLineNumber64(mt->parser)); /* XXX goto done? */ } /* */ @@ -337,12 +338,12 @@ end_element(void *data, const char *name) /* */ if (iseq(name, "band") && mt->netband != NULL) { if (mt->netband->band == NULL) { - warnx("no freqbands for band at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("no freqbands for band at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); } if (mt->netband->maxPower == 0) { - warnx("no maxpower for band at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("no maxpower for band at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); } /* default max power w/ DFS to max power */ if (mt->netband->maxPowerDFS == 0) @@ -359,16 +360,16 @@ end_element(void *data, const char *name) if (iseq(name, "country") && mt->country != NULL) { /* XXX NO_COUNTRY should be in the net80211 country enum */ if ((int) mt->country->code == NO_COUNTRY) { - warnx("no ISO cc for country at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("no ISO cc for country at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); } if (mt->country->name == NULL) { - warnx("no name for country at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("no name for country at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); } if (mt->country->rd == NULL) { - warnx("no regdomain reference for country at line %ld", - XML_GetCurrentLineNumber(mt->parser)); + warnx("no regdomain reference for country at line %" PRIu64, + XML_GetCurrentLineNumber64(mt->parser)); } mt->country = NULL; goto done; @@ -433,9 +434,9 @@ lib80211_regdomain_readconfig(struct regdata *rdp, const void *p, size_t len) XML_SetElementHandler(mt->parser, start_element, end_element); XML_SetCharacterDataHandler(mt->parser, char_data); if (XML_Parse(mt->parser, p, len, 1) != XML_STATUS_OK) { - warnx("%s: %s at line %ld", __func__, + warnx("%s: %s at line %" PRIu64, __func__, XML_ErrorString(XML_GetErrorCode(mt->parser)), - XML_GetCurrentLineNumber(mt->parser)); + XML_GetCurrentLineNumber64(mt->parser)); return -1; } XML_ParserFree(mt->parser);