diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2024-08-04 16:37:44 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2024-08-06 15:17:47 +0100 |
| commit | 696cd4ee021bac9ba26b13493d60c5840f50b9bb (patch) | |
| tree | bf9bbf564264de124a4657af95492f0849cf63b8 | |
| parent | 367b69a2803d4c0e4812b786f8f35865969f6636 (diff) | |
| download | newlib-696cd4ee021bac9ba26b13493d60c5840f50b9bb.zip newlib-696cd4ee021bac9ba26b13493d60c5840f50b9bb.tar.gz newlib-696cd4ee021bac9ba26b13493d60c5840f50b9bb.tar.bz2 | |
Cygwin: Fix warning about address known to be non-NULL in /proc/locales
Fix a gcc 12 warning about an address known to be non-NULL in
format_proc_locale_proc().
> ../../../../src/winsup/cygwin/fhandler/proc.cc: In function ‘BOOL format_proc_locale_proc(LPWSTR, DWORD, LPARAM)’:
> ../../../../src/winsup/cygwin/fhandler/proc.cc:2156:11: error: the address of ‘iso15924’ will never be NULL [-Werror=address]
> 2156 | if (iso15924)
> | ^~~~~~~~
> ../../../../src/winsup/cygwin/fhandler/proc.cc:2133:11: note: ‘iso15924’ declared here
> 2133 | wchar_t iso15924[ENCODING_LEN + 1] = { 0 };
> | ^~~~~~~~
Fixes: c42b98bdc665f ("Cygwin: introduce /proc/codesets and /proc/locales")
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
| -rw-r--r-- | winsup/cygwin/fhandler/proc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc index 8c7a4ab..f1cd468 100644 --- a/winsup/cygwin/fhandler/proc.cc +++ b/winsup/cygwin/fhandler/proc.cc @@ -2193,8 +2193,7 @@ format_proc_locale_proc (LPWSTR win_locale, DWORD info, LPARAM param) if (!(cp2 = wcschr (cp + 2, L'-'))) return TRUE; /* Otherwise, store in iso15924 */ - if (iso15924) - wcpcpy (wcpncpy (iso15924, cp, cp2 - cp), L";"); + wcpcpy (wcpncpy (iso15924, cp, cp2 - cp), L";"); } cp = wcsrchr (win_locale, L'-'); if (cp) |