git: d854d8122288 - stable/13 - ncurses: Backport a few fixes for GCC warnings from version 6.2-20210220.
Date: Wed, 03 May 2023 00:29:23 UTC
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d854d8122288dfa6b0245774ee37b02541c9b989 commit d854d8122288dfa6b0245774ee37b02541c9b989 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-05-02 23:38:54 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2023-05-02 23:38:54 +0000 ncurses: Backport a few fixes for GCC warnings from version 6.2-20210220. This is a direct commit to stable/13. --- contrib/ncurses/ncurses/base/lib_screen.c | 2 +- contrib/ncurses/ncurses/tinfo/lib_tparm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ncurses/ncurses/base/lib_screen.c b/contrib/ncurses/ncurses/base/lib_screen.c index 164356dc41de..f46e17447127 100644 --- a/contrib/ncurses/ncurses/base/lib_screen.c +++ b/contrib/ncurses/ncurses/base/lib_screen.c @@ -67,7 +67,7 @@ MODULE_ID("$Id: lib_screen.c,v 1.97 2020/02/02 23:34:34 tom Exp $") * format. It happens to be unused in the file 5.22 database (2015/03/07). */ static const char my_magic[] = -{'\210', '\210', '\210', '\210'}; +{'\210', '\210', '\210', '\210', 0}; #if NCURSES_EXT_PUTWIN typedef enum { diff --git a/contrib/ncurses/ncurses/tinfo/lib_tparm.c b/contrib/ncurses/ncurses/tinfo/lib_tparm.c index 400cd31996f8..7a53dff3addd 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_tparm.c +++ b/contrib/ncurses/ncurses/tinfo/lib_tparm.c @@ -341,7 +341,7 @@ parse_format(const char *s, char *format, int *len) * may be cases that we cannot see the explicit parameter numbers. */ NCURSES_EXPORT(int) -_nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount) +_nc_tparm_analyze(const char *string, char **p_is_s, int *popcount) { size_t len2; int i;