From nobody Fri Jan 2 20:51:48 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 4djbTd4DWvz6MFT1 for ; Fri, 02 Jan 2026 20:51:49 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djbTd06Ykz3pnK for ; Fri, 02 Jan 2026 20:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387109; 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=Jzxj3jW6+9hUQ9EmGwxloxk4FsmUt+ElQLS9+TIdHdw=; b=hYkg75fdbjQGRngLxEmsccmNVHxGELZ9OzfXgUezyO1Z9fh+GofgW/jBWKcJZXf4fNLes1 JDA+aLdZm8rWENym7MzL5jEpAHcSOA0b+ncRBFbecGgO2KOZ9pC0WRSIJTSsfBOnUAKkTh zjhZPnqXe52DNDB3fknGYdLZihfYmizoFhveGCuQqEIdbbk7+Li9p4NN3/ZsabFGWm5b4g hYmIeNqgmM9jMO3etVu17SdTFGlMu0oyUu2Q4W06dH3J0mkBEdvmrXjqmGLjJSDITsGkww SCXqsf6QN84tkYAIwMWm7AAjdNEghPRdCdFzcIohTcb4tYPCMAlO27ZmWJkLEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387109; 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=Jzxj3jW6+9hUQ9EmGwxloxk4FsmUt+ElQLS9+TIdHdw=; b=XpH9Zhu+EvpD2hoPPihJLlm7vUDelE1QfZpRCYUPHZROijlFfwaBORO6fH09FKQuw/lehb XG2gTPFXxgi2p7gNWPwVMPkwTaa/9hqDJdjFyr11xy7MzKc38F2u+B2xN7iolvkrOixm6u xKXLcvw5Pj0IhjgkO7a/sOEXnkihp3ygf3lWee+mni5LkJoZpJzDdGxOX3saBP4fSczX8K XAIqmx5/NsY4tWSZJn44Q8p5WKNrfbgCwbxarwyoaR6i0gE8Bm5vfNPNCMQWjMsdbrGQwW csD3YXFWmOmeSf87jEgSWsVjPjbLbDFJLULlzS4285Ei8F9erQX3KqoZHw3zlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387109; a=rsa-sha256; cv=none; b=VSgaUcSsGgBH0KhuPEyzd/YMvcjY/ElGnNU46GpQbN7OuHlQLrpBekZJF3AMeq8Ns7pYm/ YuxMUuGlbjoFnYPVchP5nMGxY7EP51c/BYG1/fdleIcDYbWdBdTeNeSB1F93BFCBENzrel 8e325PrBC646JRKEO2u58iQOryPj4rfAm/FVqlUlCqYbiwKhOQ0b6aiaCyaepUMKLbHON7 CNW2HQp5GEe2GE042s5bBZYEvPAufM1AR+5wD44jwRmEDCQitgH72e+oiU9eLtT2+d/Yjd i6HFVpezFdXhl317xS4wAtJbK/YHu2HjihqUj3wvZsjmF7c1GIv4L2PHctD6TQ== 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 4djbTc6rLqzZX8 for ; Fri, 02 Jan 2026 20:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b891 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b93a3312cd8c - stable/15 - sh: avoid warnings about too-long initializer strings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b93a3312cd8cde4b6026170fd9d64e2e113f5253 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:48 +0000 Message-Id: <69582fe4.b891.6afc5c69@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b93a3312cd8cde4b6026170fd9d64e2e113f5253 commit b93a3312cd8cde4b6026170fd9d64e2e113f5253 Author: Dimitry Andric AuthorDate: 2025-12-25 20:13:48 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:40:38 +0000 sh: avoid warnings about too-long initializer strings Mark `optletter` and `t_op::op_text` as `__non_string`, to avoid warnings from clang 21 similar to: bin/sh/options.h:77:36: error: initializer-string for character array is too long, array size is 19 but initializer has size 20 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 77 | const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; | ^~~~~~~~~~~~~~~~~~~~~ bin/test/test.c:153:3: error: initializer-string for character array is too long, array size is 2 but initializer has size 3 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 153 | {"==", STREQ}, | ^~~~ MFC after: 3 days Reviewed by: jilles Differential Revision: https://reviews.freebsd.org/D54362 (cherry picked from commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802) --- bin/sh/options.h | 2 +- bin/test/test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sh/options.h b/bin/sh/options.h index a059e19707b1..2ce2e6ebedf2 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -74,7 +74,7 @@ extern char optval[NOPTS]; extern const char optletter[NSHORTOPTS]; #ifdef DEFINE_OPTIONS char optval[NOPTS]; -const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh"; +const char optletter[NSHORTOPTS] __nonstring = "efIimnsxvVECabupTPh"; static const unsigned char optname[] = "\007errexit" "\006noglob" diff --git a/bin/test/test.c b/bin/test/test.c index a35c5b424d3f..5ba5df5d7e44 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -116,7 +116,7 @@ enum token { #define TOKEN_TYPE(token) ((token) & 0xff00) static const struct t_op { - char op_text[2]; + char op_text[2] __nonstring; short op_num; } ops1[] = { {"=", STREQ},