From nobody Mon Aug 3 14:30:46 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 4hDJxg3bcfz6nVHK for ; Mon, 03 Aug 2026 14:30: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDJxf3B0Lz3swV for ; Mon, 03 Aug 2026 14:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785767446; 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=r7v6G6cwoTfp5yz7O3DVoBLN81HDtf6ImWMtALjZcPw=; b=Md8KTvSXcgUa8L4l6+md7WrQpE181MvKhdL0kdLxh7EUjzokpMcG0BMfuvGy+yB5I3D0R2 Uv8UaxqLMraEuePt9L2gJb0UDGUgY3RMmfjAPkKHJqUG68uwBwDosUCVfwciW2Qz8zS4nM 5l3ap50CHI7U7SXh8W0+pcCx7yIxETWF9gqXrKYmwQnlLGJSWhpRt5znbCyJ1OxtZjTQxa x122q/gQl2GjzzWIHLhIZuZAs6eNB8+UvMyb4C7H8NAbKyIPZMJgpq9VwXpijtMhCVT5Ay v9iKdit+ozaq3plAffESBn15bWYGdykaKo0SvIvH2NtHhVa/9P3PQ+bKZpTJTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785767446; a=rsa-sha256; cv=none; b=SnoXECs4GWhdsoO2+qdRfDteoGFmuwa4RCdtSb3RM0phKQK1f5c1R9Ix8rWEFc1CF9oSnw JMMCexKufCrYBRGserD0wrNUIw3qYA0tbrvbyvTz0Ee9xf3JWKWKWLwQPO0NBfB4G2+8D5 EZSdq7beB1DQx+oBu3vB4cjYcpRNSQtVnZ8lo/4twF1Psu8dwUMXi6Tnf0DtyjFlU/s6Gq QIOvhJuLBZfHteC2V+ggkE2jk0M7ULe61vicew1fzeLRZV4UR1iS8+jZIv8M0M6D9ZeNWc jWQeDA/MODGNJGZV/3ZAJil9dd1ltGkhqOC3iwWcoycd0uKYprRVY1hNFizu8g== 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=1785767446; 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=r7v6G6cwoTfp5yz7O3DVoBLN81HDtf6ImWMtALjZcPw=; b=DwDDcK/TPANEefF1ng5yHuX6GDAaShW7AOsVhsEVTua+rDbxtS7vtvX/Tw/xwIgj4jrin+ reO2SEW2rYlg6uEFnfobWQhIieU+XFlBcCd+pavG3gDJvVUnwiugV3OkgJhw16LB+NXVF/ raNyDA76TTODIuwKakZNfhyOltUj+P8VqK/jE5acVVtSRsohdMg2Buhduevf5fir6Xhes9 uoXJLKQRAJc14xKDWifX6rG8F0bn1T2Rhf7on3q7Yl8G7wsMMZ4cMz2+VHz62HHtwciIEt 2klAcrCDdMzN/vFatiBMXOBMNwBCgb7CSMEizR8t9j31rdSNFNJi1f590Im/zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDJxf1Fn0z14XY for ; Mon, 03 Aug 2026 14:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36aae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 14:30:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 9fd8f5e761ba - main - mkimg: 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/main X-Git-Reftype: branch X-Git-Commit: 9fd8f5e761ba663c8e99eeff64c5a7fd7bcf1e05 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 14:30:46 +0000 Message-Id: <6a70a616.36aae.2eb32f30@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd8f5e761ba663c8e99eeff64c5a7fd7bcf1e05 commit 9fd8f5e761ba663c8e99eeff64c5a7fd7bcf1e05 Author: Lexi Winter AuthorDate: 2026-08-03 14:08:13 +0000 Commit: Lexi Winter CommitDate: 2026-08-03 14:08:13 +0000 mkimg: 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 mkimg during the bootstrap build, since it assumes the return value is always a mutable pointer. Make the existing 'sep' pointer const to fix the first case, and for the second, introduce a new non-const pointer for strchr, since we do modify the result in that case. MFC after: 1 week Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58493 --- usr.bin/mkimg/mkimg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index 4a288d66be81..e814b67b1186 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -248,7 +248,8 @@ static int parse_part(const char *spec) { struct part *part; - char *sep; + const char *sep; + char *asep; size_t len; int error; @@ -301,15 +302,14 @@ parse_part(const char *spec) goto errout; } - spec = part->alias; - sep = strchr(spec, '/'); - if (sep != NULL) { - *sep++ = '\0'; - if (strlen(part->alias) == 0 || strlen(sep) == 0) { + asep = strchr(part->alias, '/'); + if (asep != NULL) { + *asep++ = '\0'; + if (strlen(part->alias) == 0 || strlen(asep) == 0) { error = EINVAL; goto errout; } - part->label = strdup(sep); + part->label = strdup(asep); if (part->label == NULL) { error = ENOMEM; goto errout;