From: Bruno Haible Date: Thu, 18 May 2023 22:45:46 +0000 (+0200) Subject: canonicalize: Silence gcc warning. X-Git-Tag: v1.0~1311 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2f782579a612af7389356dfc4f6ef8251d8b0003;p=gnulib.git canonicalize: Silence gcc warning. * lib/canonicalize.c: Add #pragma GCC diagnostic. (IF_LINT): Remove macro. (canonicalize_filename_mode_stk): Remove use of IF_LINT. --- diff --git a/ChangeLog b/ChangeLog index 50a9cef230..717789d423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-05-18 Bruno Haible + + canonicalize: Silence gcc warning. + * lib/canonicalize.c: Add #pragma GCC diagnostic. + (IF_LINT): Remove macro. + (canonicalize_filename_mode_stk): Remove use of IF_LINT. + 2023-05-18 Bruno Haible vasnprintf, c-vasnprintf: Silence gcc warning. diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 010190d275..d73ee2c894 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -34,13 +34,6 @@ #include "hash-triple.h" #include "xalloc.h" -/* Suppress bogus GCC -Wmaybe-uninitialized warnings. */ -#if defined GCC_LINT || defined lint -# define IF_LINT(Code) Code -#else -# define IF_LINT(Code) /* empty */ -#endif - #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT # define DOUBLE_SLASH_IS_DISTINCT_ROOT false #endif @@ -51,6 +44,11 @@ # define SLASHES "/" #endif +/* Avoid false GCC warning "'end_idx' may be used uninitialized". */ +#if __GNUC__ + (__GNUC_MINOR__ >= 7) > 4 +# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif + /* Return true if FILE's existence can be shown, false (setting errno) otherwise. Follow symbolic links. */ static bool @@ -369,7 +367,7 @@ canonicalize_filename_mode_stk (const char *name, canonicalize_mode_t can_mode, buf[n] = '\0'; char *extra_buf = bufs->extra.data; - idx_t end_idx IF_LINT (= 0); + idx_t end_idx; if (end_in_extra_buffer) end_idx = end - extra_buf; size_t len = strlen (end);