niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

locale/programs/locarchive.c: fix warn unused result

Browse source 
Fix unused result warnings, detected when _FORTIFY_SOURCE is enabled in
glibc.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Frédéric Bérat 2023-04-28 14:21:29 +02:00 • committed by Siddhesh Poyarekar
parent da55fae9e2
commit d4ad86a0e1
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
locale/programs/locarchive.c
View file

@ -1154,10 +1154,14 @@ add_locale_to_archive (struct locarhandle *ah, const char *name,
if (mask & XPG_NORM_CODESET) if (mask & XPG_NORM_CODESET)
/* This name contains a codeset in unnormalized form. /* This name contains a codeset in unnormalized form.
We will store it in the archive with a normalized name. */ We will store it in the archive with a normalized name. */
asprintf (&normalized_name, "%s%s%s.%s%s%s", if (asprintf (&normalized_name, "%s%s%s.%s%s%s",
language, territory == NULL ? "" : "_", territory ?: "", language, territory == NULL ? "" : "_", territory ?: "",
normalized_codeset, normalized_codeset,
modifier == NULL ? "" : "@", modifier ?: ""); modifier == NULL ? "" : "@", modifier ?: "") < 0)
{
free ((char *) normalized_codeset);
return -1;
}
/* This call does the main work. */ /* This call does the main work. */
locrec_offset = add_locale (ah, normalized_name ?: name, data, replace); locrec_offset = add_locale (ah, normalized_name ?: name, data, replace);
@ -1188,10 +1192,14 @@ add_locale_to_archive (struct locarhandle *ah, const char *name,
normalized_codeset = _nl_normalize_codeset (codeset, strlen (codeset)); normalized_codeset = _nl_normalize_codeset (codeset, strlen (codeset));
mask |= XPG_NORM_CODESET; mask |= XPG_NORM_CODESET;
asprintf (&normalized_codeset_name, "%s%s%s.%s%s%s", if (asprintf (&normalized_codeset_name, "%s%s%s.%s%s%s",
language, territory == NULL ? "" : "_", territory ?: "", language, territory == NULL ? "" : "_", territory ?: "",
normalized_codeset, normalized_codeset,
modifier == NULL ? "" : "@", modifier ?: ""); modifier == NULL ? "" : "@", modifier ?: "") < 0)
{
free ((char *) normalized_codeset);
return -1;
}
add_alias (ah, normalized_codeset_name, replace, add_alias (ah, normalized_codeset_name, replace,
normalized_name ?: name, &locrec_offset); normalized_name ?: name, &locrec_offset);