about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2010-03-26 09:21:34 -0700
committerRichard Henderson <rth@twiddle.net>2010-03-26 09:21:34 -0700
commit6e9331df8bb546363724aaf50d8b023a0167c06d (patch)
tree87c4d46f783c13a14cb2c9a01c37f4a9155be130
parentb1c1949e60e7c61bcd9f40f712d07494596491b2 (diff)
downloadglibc-6e9331df8bb546363724aaf50d8b023a0167c06d.tar.gz
glibc-6e9331df8bb546363724aaf50d8b023a0167c06d.tar.xz
glibc-6e9331df8bb546363724aaf50d8b023a0167c06d.zip
Finish locale_data -> __locale_data transition.
The transition that was begun here
f095bb7204d80f609a73a22796edd6cffd4c6add
was not complete.

Signed-off-by: Richard Henderson <rth@twiddle.net>
-rw-r--r--ChangeLog5
-rw-r--r--locale/setlocale.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 72cbef6681..23393e6763 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 4ebce78244..46372fdcac 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);