From nobody Sat Dec 27 21:59:03 2025 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 4ddxFz44sCz6Lx9Q for ; Sat, 27 Dec 2025 21:59:03 +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 4ddxFz3DXwz3hLS for ; Sat, 27 Dec 2025 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766872743; 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=8lXBHyD5NVDWmsaRglquEScFmoUQZ+7phqUMPeH3HVw=; b=C9L9C9gt2v604cLWqBufkIWhPtNyctl+ZT8SI5zjHsqMTedVPAcCeaqUj4mdT/QhcEOp8o uHVpcG5m/chebVupbbKHeCAiHKKYzB0+RhFWYBnQxnFFCc/h3xEo8ssGdQFd24bCDDaPYP oaiWBnSxZo8no0X7vzynEIZWyIdV55iZoogFlEOZqVFYoyZjdrn1gdJf25WjRqgiuOdZtt q5/uHKlJjJHa9pdB6Q9SL9h2S45+4HGgUDx5RZlFyNX6xwjXVCcw5dLA6qdLGZ3Hgnee7Y /pR/AymH7yCvzGIKQOpWtUNG5rBVQDs2L8g0h+HQIOC4wJw2QEMCQJHmZCEPJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766872743; 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=8lXBHyD5NVDWmsaRglquEScFmoUQZ+7phqUMPeH3HVw=; b=jDihsuV9oYlFH/+gwGAgSYvvOjr/aMwcpD/1bKbww3UFSADAtT3xqQTyoHdVu85e08fBGO trkX3UewbTajDIPCxekQhl4SrWz9FJYrFwxRTToqD2NPdQyLrIo10n6k83sDF9B8bxoYVX Nify7atGv6bz7KKDKmh9SOVAQ6Pc+w+tVu9Qzw4WrXyMrOvO5rSHMdPBpPmn5U5cC3LwNB W3ur2kTWiod5FUBRFQW/ZXkT1lYUgtnkpZEcG7v1nhEzox8hc4b3LFwSIJJPEyTH1YjX1J vQGrmNhZaZ2lefoA0NwkyHZVvrCVq0tewcvEEN+Y8ohBck77fv6kuSuL+HOlqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766872743; a=rsa-sha256; cv=none; b=IxY/RTxUxFrG3/LLREiU2tzRDiQRkegpegkerXMMiSt3YGNYpkedD8z3UWsT9b/JtR7vgF 9rrqClE7llwD3y7IwNVViTpSqVCzrTOb07cejy3cq1offdigugZ/xGnX8gZqdRb5snoOeH vfsvNv6pRIoI0s8tZ4K9MKphnHQIR3xheipKOX4X3ypgd1tM1EW1Qv2Hp6VCP9D0L2eKhH CGlWFABgLC+5dvo0fafrs5QM4q/fqajc6yruexpTElruT6Cbx1mlAX+G3Dtimylf/i/5Sj Dcqu/66ct5nlNrJlBCJf5B8CNogbjiJlE/ukZXU/kOZPYmUZOHYycUqlxO9+ug== 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 4ddxFz2NhVz2DB for ; Sat, 27 Dec 2025 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ecb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Dec 2025 21:59:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e6546807f4c1 - main - sh: avoid warnings about too-long initializer strings 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 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/main X-Git-Reftype: branch X-Git-Commit: e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802 Auto-Submitted: auto-generated Date: Sat, 27 Dec 2025 21:59:03 +0000 Message-Id: <695056a7.ecb4.68a2c53f@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802 commit e6546807f4c1a8a6a6fa53fceab7b8c80e3ed802 Author: Dimitry Andric AuthorDate: 2025-12-25 20:13:48 +0000 Commit: Dimitry Andric CommitDate: 2025-12-27 21:58:25 +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 --- 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},