diff options
Diffstat (limited to 'locale/findlocale.c')
| -rw-r--r-- | locale/findlocale.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/locale/findlocale.c b/locale/findlocale.c index af2b364..94f01b4 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -88,7 +88,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, loc_name = (char *) *name; /* Make a writable copy of the locale name. */ - loc_name = __strdup (loc_name); + loc_name = strdupa (loc_name); /* LOCALE can consist of up to four recognized parts for the XPG syntax: @@ -137,11 +137,6 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, /* This means we are out of core. */ return NULL; } - else - /* If the addressed locale is already available it should be - freed. If we would not do this switching back and force - between two locales would slowly eat up all memory. */ - free ((void *) loc_name); if (locale_file->decided == 0) _nl_load_locale (locale_file, category); @@ -238,11 +233,11 @@ _nl_remove_locale (int locale, struct locale_data *data) static void __attribute__ ((unused)) free_mem (void) { - int locale; + int category; - for (locale = 0; locale < LC_ALL; ++locale) + for (category = 0; category < LC_ALL; ++category) { - struct loaded_l10nfile *runp = locale_file_list[locale]; + struct loaded_l10nfile *runp = locale_file_list[category]; while (runp != NULL) { @@ -252,6 +247,7 @@ free_mem (void) if (data != NULL && data->usage_count != UNDELETABLE) _nl_unload_locale (data); runp = runp->next; + free ((char *) here->filename); free (here); } } |