From: Florian Weimer Date: Mon, 23 May 2022 08:08:18 +0000 (+0200) Subject: locale: Call _nl_unload_locale from _nl_archive_subfreeres X-Git-Tag: glibc-2.36~265 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b6342e769be6903f29da067f5cbcbfcc7c01b10;p=thirdparty%2Fglibc.git locale: Call _nl_unload_locale from _nl_archive_subfreeres The function performs the same steps for ld_archive locales (mapped from an archive), and this code is not performance-critical, so the specialization does not add value. Reviewed-by: Adhemerval Zanella --- diff --git a/locale/loadarchive.c b/locale/loadarchive.c index e7c797bc70a..5a2356707fe 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -515,13 +515,7 @@ _nl_archive_subfreeres (void) free (dead->name); for (category = 0; category < __LC_LAST; ++category) if (category != LC_ALL && dead->data[category] != NULL) - { - /* _nl_unload_locale just does this free for the archive case. */ - if (dead->data[category]->private.cleanup) - (*dead->data[category]->private.cleanup) (dead->data[category]); - - free (dead->data[category]); - } + _nl_unload_locale (dead->data[category]); free (dead); } archloaded = NULL;