From dab152a4a1d3c05d261c7ab702a4eea983041d29 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 19 May 2023 00:45:50 +0200 Subject: [PATCH] getndelim2: Silence gcc warning. * lib/getndelim2.c: Add #pragma GCC diagnostic. (IF_LINT): Remove macro. (getndelim2): Remove use of IF_LINT. --- ChangeLog | 7 +++++++ lib/getndelim2.c | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 717789d423..8e980741c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-05-18 Bruno Haible + + getndelim2: Silence gcc warning. + * lib/getndelim2.c: Add #pragma GCC diagnostic. + (IF_LINT): Remove macro. + (getndelim2): Remove use of IF_LINT. + 2023-05-18 Bruno Haible canonicalize: Silence gcc warning. diff --git a/lib/getndelim2.c b/lib/getndelim2.c index d61ce3a494..b2a40ac5ce 100644 --- a/lib/getndelim2.c +++ b/lib/getndelim2.c @@ -50,11 +50,9 @@ # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) #endif -/* Use this to suppress gcc's "...may be used before initialized" warnings. */ -#if defined GCC_LINT || defined lint -# define IF_LINT(Code) Code -#else -# define IF_LINT(Code) /* empty */ +/* Avoid false GCC warning "'c' may be used uninitialized". */ +#if __GNUC__ + (__GNUC_MINOR__ >= 7) > 4 +# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif /* The maximum value that getndelim2 can return without suffering from @@ -108,7 +106,7 @@ getndelim2 (char **lineptr, size_t *linesize, size_t offset, size_t nmax, /* Here always ptr + size == read_pos + nbytes_avail. Also nbytes_avail > 0 || size < nmax. */ - int c IF_LINT (= 0); + int c; const char *buffer; size_t buffer_len; -- 2.39.5