From nobody Wed Oct 07 01:16:47 2026 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 4hzwFW6BL1z6k2P7 for ; Wed, 07 Oct 2026 01:16:47 +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 4hzwFW5PvCz4Ktj for ; Wed, 07 Oct 2026 01:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791335807; 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=rIqFbM59uDtA4fNO85QVzHoTZDLK8vyhtZcTD8twYPU=; b=Q5MRaPfn/thGMMLW43wVUr3TYXiOIKD7hUDT2J3ECSYYftL+5i03jtkcdxrc9XjiKEAlxN RLyibkXgcLrWhqxPbwLWXfHLlr/wqdCsSDRma33weELliFVR5xdhp9nZpxOUyEPMfJsM3w w1hgeP0l6yypEqB+efTnSqJBTqvqrAvdhpM+REtXe1yR4E0IczxqvkVtWu28kDzg75FYsi WurdwarxmQiAW0RegBgUk0ME2z5fKt6mFIGYaK0adXC8dL8CTClz+0ZfgOITHb005XY1CC c6ozNHJpddyEC79AwHGxP3L/ohAUA2FqjAEulaPgRbVl+b2aZvbIINYNYPdKag== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791335807; b=X0MihT5f/uszHxpkUpn26GpRXzLoPJftQ7pHIeUjPQj3KDymsLoCIQSAT5nFEm/oBNi52R 8Uj8io2EFxKDuuWhdOXUv5+HoL2BIRo0vwYa3x6rixcZur2jE/DKjqbmX478DGWQ2DdwDE WA/DpZDKjn4enp3JSP7sbuVXZZsVSpqqfVc4PFq0+LmdEx7y6SltD84ZOTPuupbdV3qW7m bDoonZ0Mc3ZVXv3HOT/Pd7viirh8eQ9B/PxGkqEv4dL+3WQiIG2PX3k4ZJrzJkAl2HLJIk zzBJFPlJRa4Cgm4jTFvsHL80P7MBu0tV8QKIK8nxej7UdvVsRnC5rc8F2XzfqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791335807; 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=rIqFbM59uDtA4fNO85QVzHoTZDLK8vyhtZcTD8twYPU=; b=C78vG4TNDLL/daAnAzjP4Sjq/vq1hMZOP8d2uYLZa29SpKX+FazVyzG35c/RHkiyl94cFe 1aWD6E5+vXEtIqwCCYt4b3D6hRuXGIgjUGikGGBV1Xgy7eDaXRr4FdsSc+2HG7gLGEYjJ/ jaQWzuL0Py4yfLw92bsuifxUt0okXr32+rY9t9bO6Ra/Vvvq6LjiOWGxdXVFAqvd7DToTM sUIPppMEExOR05SMUm/yNmB6wcfW2CkAlFeTGLHsqaYzwQ1YZuqerrcTHmdpEB+dlpE9mM 8yqYpvicREK041HQuYfDLIpfmtjOpBa2hCXYtS0O+Z79ChIhn40EJPppcS7B1w== 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 4hzwFW4V2BzWPF for ; Wed, 07 Oct 2026 01:16:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18cc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 01:16:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 657c089950a0 - main - lib80211: fix build with eXpat 2.9.0 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 657c089950a0388811c7ba3f6d3e7127c297864e Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 01:16:47 +0000 Message-Id: <6ac59d7f.18cc2.7d392a48@gitrepo.freebsd.org> The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=657c089950a0388811c7ba3f6d3e7127c297864e commit 657c089950a0388811c7ba3f6d3e7127c297864e Author: Philip Paeps AuthorDate: 2026-10-06 03:14:03 +0000 Commit: Philip Paeps CommitDate: 2026-10-07 01:15:49 +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. --- 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);