This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-495-g5f078c3
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Nov 2011 14:26:32 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-495-g5f078c3
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5f078c3286c177a4d66ad89e7b3930e2d6132586 (commit)
from fe72eebd678166aad132a29865ee6cc78e746acc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5f078c3286c177a4d66ad89e7b3930e2d6132586
commit 5f078c3286c177a4d66ad89e7b3930e2d6132586
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Nov 8 09:26:08 2011 -0500
Use strcasecmp_l instead of strcasecmp
diff --git a/ChangeLog b/ChangeLog
index ba46369..bf09161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-11-08 Ulrich Drepper <drepper@gmail.com>
+ * locale/findlocale.c (_nl_find_locale): Use __strcasecmp_l.
+ * intl/localealias.c (strcasecmp): Define using __strcasecmp_l.
+
* sysdeps/i386/i686/multiarch/strcmp-ssse3.S: Remove unnecessary
instructions.
diff --git a/intl/localealias.c b/intl/localealias.c
index 735107a..6f5fa12 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,5 +1,5 @@
/* Handle aliases for locale names.
- Copyright (C) 1995-2002, 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995-2002, 2003, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -64,7 +64,7 @@ char *alloca ();
/* Rename the non ANSI C functions. This is required by the standard
because some ANSI C functions will require linking with this object
file and the name space must not be polluted. */
-# define strcasecmp __strcasecmp
+# define strcasecmp(s1, s2) __strcasecmp_l (s1, s2, _nl_C_locobj_ptr)
# ifndef mempcpy
# define mempcpy __mempcpy
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 2fec9a7..6c888f0 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -258,7 +258,8 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
}
/* Determine whether the user wants transliteration or not. */
- if (modifier != NULL && __strcasecmp (modifier, "TRANSLIT") == 0)
+ if (modifier != NULL
+ && __strcasecmp_l (modifier, "TRANSLIT", _nl_C_locobj_ptr) == 0)
((struct __locale_data *) locale_file->data)->use_translit = 1;
/* Increment the usage count. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
intl/localealias.c | 4 ++--
locale/findlocale.c | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources