This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 2/4] Finish locale_data -> __locale_data transition.
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-alpha at sourceware dot org
- Date: Fri, 26 Mar 2010 09:21:34 -0700
- Subject: [PATCH 2/4] Finish locale_data -> __locale_data transition.
- References: <cover.1269622476.git.rth@twiddle.net>
The transition that was begun here
f095bb7204d80f609a73a22796edd6cffd4c6add
was not complete.
Signed-off-by: Richard Henderson <rth@twiddle.net>
---
ChangeLog | 5 +++++
locale/setlocale.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 72cbef6..23393e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-03-26 Richard Henderson <rth@redhat.com>
+ * locale/setlocale.c (free_category): Finish renaming
+ struct locale_data to __locale_data.
+
+2010-03-26 Richard Henderson <rth@redhat.com>
+
* csu/gmon-start.c (ENTRY_POINT, etext): Declare as char[], not void.
* elf/dl-sysdep.c (_end): Likewise.
* sysdeps/unix/sysv/dl-sysdep.c (frob_brk): Likewise with locally
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 4ebce78..46372fd 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -465,7 +465,7 @@ libc_hidden_def (setlocale)
static void __libc_freeres_fn_section
free_category (int category,
- struct __locale_data *here, struct locale_data *c_data)
+ struct __locale_data *here, struct __locale_data *c_data)
{
struct loaded_l10nfile *runp = _nl_locale_file_list[category];
@@ -481,7 +481,7 @@ free_category (int category,
while (runp != NULL)
{
struct loaded_l10nfile *curr = runp;
- struct __locale_data *data = (struct locale_data *) runp->data;
+ struct __locale_data *data = (struct __locale_data *) runp->data;
if (data != NULL && data != c_data)
_nl_unload_locale (data);
--
1.6.6.1