diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2025-12-30 12:48:07 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2026-01-02 20:50:13 +0000 |
| commit | 936112e7ff707e3a9cfdbcc3737bed580f400d6b (patch) | |
| tree | 9df7ad83f6ad675eac4f90aeda262ab1cc28b0a4 | |
| parent | 958f2ab6d400de5a8990c392d17eecaf2e47e6c4 (diff) | |
ncurses: avoid warnings about too-long initializer strings
Increase the size of `assoc::from` to 8 bytes, to avoid warnings from
clang 21 similar to:
contrib/ncurses/progs/infocmp.c:702:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization]
702 | DATA("\033[2J", "ED2"), /* clear page */
| ^~~~~~~~~
contrib/ncurses/progs/infocmp.c:716:10: error: initializer-string for character array is too long, array size is 4 but initializer has size 5 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization]
716 | DATA("\033[!p", "DECSTR"), /* soft reset */
| ^~~~~~~~~
Reviewed by: markj
Obtained from: https://invisible-island.net/archives/ncurses/6.5/ncurses-6.5-20241207.patch.gz
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D54371
(cherry picked from commit 667259b392ec0a86d066ccc6ba0f4025b3d2a083)
| -rw-r--r-- | contrib/ncurses/progs/infocmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index f42ff3416ece..92a56b01669d 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -660,7 +660,7 @@ compare_predicate(PredType type, PredIdx idx, const char *name) #define DATAX() DATA("", "") typedef struct { - const char from[4]; + const char from[8]; const char to[12]; } assoc; |