From nobody Wed Aug 26 10:12:38 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 4hVL7C24RYz6ppvf for ; Wed, 26 Aug 2026 10:12:39 +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 4hVL7B5sT8z42Xv for ; Wed, 26 Aug 2026 10:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787739158; 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=Y7+V5/IORXgF91uchAP9aaEyZkmNpXD8E5m2ARR13QY=; b=Kb/76usINu7t3r1uP7V0eCtrH5xJnEB+2oGs6L53YMOJ1hJDSMOhmX3S1sUVRDcKQj4Kms dfNwTdzqpF8lPYsbbGS0P0jp6KwCbUlSuMToEJ7+/wxqHaQXr14hqtjuwgD+VSLyTFlFyo w39IDqibcgHaJM7quiM6WCvOrMRJRy6NIvkpdcY8pYgFMCQkcIAc57GHRX+T/0YTAarmpi OmLUS8f7fgBAlOuQJolYpyf3ajX3gYomlICl83QAMqcwYZl9hDzPnoQGGIQE5veXPYmSeM gA5kigAYqjl2bs3bjyTLCWmRE77+7NBF1wqGmPFxK3hwfomtT09I5tvPqoreyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787739158; a=rsa-sha256; cv=none; b=H5uQjIW8jaNUzLOavO5OmUz9u0EbcpmR4zlTSS0L2O2LMN0pmQVitxPHkFrzFQ9NpOI/wO ahVkeGLZPHu7xwxx6knBb4J3uTGw2LS8SxTaEnQFqaLohpRaVRsZck782Ggane4bIHVMHg 8Eju4mcjSjtgLu+FR3PftN8En/J5+ahO/GzXjicyyajN72taKhE4+f6ZhEyB2mSSSdSXDZ vksmtDwkpZff7UZpofE+zkXoo5dC5PmA18T6FaihMvLlKXEDXFNzeALbpTu7cu42u4eC11 NX+xKabv8oZ2333Y6JazxoheCrx+/zpbHHJqfCOjKTgmVp9TRmGYQpvsQxuw6w== 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=1787739158; 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=Y7+V5/IORXgF91uchAP9aaEyZkmNpXD8E5m2ARR13QY=; b=b4QM2CHGwdtQsdCxNDxXjnIAC5VSBPp8ehDAyuPqUWRS80FqjNN81wsWjO4uuHYAatrdXN i9OmTbvymirgQjDdntkLY+pfc+dIxMTRCCvBZzTvmfnyppKI+qtyNK+KND5ycOWrkuxPmB H01EqzZ9FI9sPhtu5R4RokU/RjgTzOjQAXqpXTPWozoMNSef5GFavj5Tq2smd2zoc2bJ3F 8AfoO762XOXJApJaKGNGXpuCkqcmbE8FmSmgWfHGPCbYie8P8WylVxJ3Z9Qh+FHScgXdL7 h42f2q63u5gMN5A2QzTj34Dw4isOVFKS6gopBRwM71741ChkGw/0TxhOGKgCKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hVL7B4cF9zZSG for ; Wed, 26 Aug 2026 10:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39310 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Aug 2026 10:12:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: ec58dba0ed80 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ec58dba0ed806875f7e9da5b1475b85db52421fd Auto-Submitted: auto-generated Date: Wed, 26 Aug 2026 10:12:38 +0000 Message-Id: <6a8ebc16.39310.701d9f4f@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ec58dba0ed806875f7e9da5b1475b85db52421fd commit ec58dba0ed806875f7e9da5b1475b85db52421fd Author: Lexi Winter AuthorDate: 2026-08-03 14:08:13 +0000 Commit: Lexi Winter CommitDate: 2026-08-26 09:56:12 +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 (cherry picked from commit 9fd8f5e761ba663c8e99eeff64c5a7fd7bcf1e05) --- 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 c625b49dc29a..03dd76943393 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;