From nobody Wed Aug 26 10:12:35 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 4hVL775RSXz6pphQ for ; Wed, 26 Aug 2026 10:12:35 +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 4hVL773n8Tz42ZJ for ; Wed, 26 Aug 2026 10:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787739155; 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=CDeKyP3mmHORvGxRwy97LMd9nQis2TEJmz67pBJxBmY=; b=DXUsmJjQ8Myj4YXt8ICj6QaG1uwfHTUe4v7nLZl3lycdZmfZcoSbV0ZlSEE+jar2vS4yRE kAtfqljDf1ORsrLl4KEJIjPy7U2UOlFP4qQOf59Qgjk9VkkREcjsEC/sNPont9obujOBPn VHaXq9ZFSrvuTEgLPaKp8cKo8eHmiFYWRB+Q8BW6bvI+y2bMPGPZvcoeXSHH/StmS81wZh qlyIJJxZw4652/8ACzX08b7jNDpvRpFKbVNRbIN7ArvyGbbyO5xjvBnxMxlyAJlOhvuLXK vJOXzu7sOsdLI0T8HAFk74bC0bb1tCij9wElx7O8IqTy4+RIgUPBBmbRa+0tXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787739155; a=rsa-sha256; cv=none; b=PHEnt1L6VrusCOvzj3Wua71TY0EHYKEHG7tXTjT0EK/vlmI+WHmWoKUCuvNz/EmT+yFgao XJyBrzZN+3JbavL15SqLJBdF4cNtSrJlaIz67PiLBmMI3ck2B8giWRrhNddX2BENlxAKQe WPOmMjHp0Gk79405jsN+VsQicMMiKLHfKtYFSbNjL7S++MIFesMc3K+fufGOCtOHxTw4Qy 5Zg1JxTpB6lIT0slL+BZcJSiLEwJXG3Btj9saxeVfHDA33JMAp9AQNvjM2IRgucLE/TJ5Z meTNx6QSLCt1YxGo+JS8euQ1iDTt1/Loi1ZUR9D56UyzU2UKebV57ASljDwBJg== 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=1787739155; 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=CDeKyP3mmHORvGxRwy97LMd9nQis2TEJmz67pBJxBmY=; b=sjDJN/ZWoW37rp7Mw4EQWSGxOUcHX0Q1vJVtSLyODAmvf2CQ5IDlTmHnzeV6rEVGMbeXxf PmtGBPb8ZKXatDEA95J3koTMaTvHKMbXz23EX/L7ymjunstyA/5/XNQNvBYd6SFCDmAQnf oYlH7hDlpA9Gvzd+a+9WdAQgk+T8RrqA7n70CaEAEvODH7+imzGLm97qf8ZM5WDPhTOc8V 5Da1Uz9T1ArprhnaBozmX/S+FUaCnKnGCRjhML8YGoGotV9YIyoVs39X4L1MQB6JdofoRg l2gzlIpSAQX49ORIsHr99XgthmFyqUYfjE/vbuBAvj0NgRFGwpZDl4CyTiv0Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVL772gB9zZGW for ; Wed, 26 Aug 2026 10:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39538 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 10:12:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8c71eb51d2ee - stable/15 - libucl: Const correctness for C23 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8c71eb51d2eec6f2a29eaa171b3f6ca51d8c76c6 Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 10:12:35 +0000 Message-Id: <6a8ebc13.39538.2d178854@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8c71eb51d2eec6f2a29eaa171b3f6ca51d8c76c6 commit 8c71eb51d2eec6f2a29eaa171b3f6ca51d8c76c6 Author: Lexi Winter AuthorDate: 2026-08-03 14:05:09 +0000 Commit: Lexi Winter CommitDate: 2026-08-26 09:56:12 +0000 libucl: Const correctness for C23 On some platforms, e.g. Linux Clang 22.1.8 / glibc 2.43, strchr() now implements the C23 behaviour where passing a const pointer to strchr() also returns a const pointer. This breaks libucl during the bootstrap build, since it assumes the return value is always a mutable pointer. Instead of assigning directly to params->prefix (which is const), use a non-const temporary variable and assign the result after we've done the modification. MFC after: 1 week Reviewed by: bofh, bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58490 (cherry picked from commit bcee560d390eb8aa8fd0f08a7a0bffb6e77fffc6) --- contrib/libucl/src/ucl_util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/libucl/src/ucl_util.c b/contrib/libucl/src/ucl_util.c index 8f97c20db503..b9f689a3dd67 100644 --- a/contrib/libucl/src/ucl_util.c +++ b/contrib/libucl/src/ucl_util.c @@ -1090,7 +1090,7 @@ ucl_include_file_single (const unsigned char *data, size_t len, bool res; struct ucl_chunk *chunk; unsigned char *buf = NULL; - char *old_curfile, *ext; + char *old_curfile, *ext, *tmp; size_t buflen = 0; char filebuf[PATH_MAX], realbuf[PATH_MAX]; int prev_state; @@ -1201,12 +1201,13 @@ ucl_include_file_single (const unsigned char *data, size_t len, if (params->use_prefix && params->prefix == NULL) { /* Auto generate a key name based on the included filename */ - params->prefix = basename (realbuf); - ext = strrchr (params->prefix, '.'); + tmp = basename(realbuf); + ext = strrchr(tmp, '.'); if (ext != NULL && (strcmp (ext, ".conf") == 0 || strcmp (ext, ".ucl") == 0)) { /* Strip off .conf or .ucl */ *ext = '\0'; } + params->prefix = tmp; } if (params->prefix != NULL) { /* This is a prefixed include */