From 8795574510d8fa852755c26433ecd812f7c1f2e0 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 16 Jul 2013 23:15:41 +0000 Subject: * st.c (st_locale_insensitive_strcasecmp): Renamed from st_strcasecmp. (st_locale_insensitive_strncasecmp): Renamed from st_strncasecmp. * include/ruby/st.h: Follow above changes. * include/ruby/ruby.h: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ include/ruby/ruby.h | 8 ++++---- include/ruby/st.h | 4 ++-- st.c | 6 +++--- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 241875f4eb..4ceb79d96e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Jul 17 08:12:41 2013 Tanaka Akira + + * st.c (st_locale_insensitive_strcasecmp): Renamed from st_strcasecmp. + (st_locale_insensitive_strncasecmp): Renamed from st_strncasecmp. + + * include/ruby/st.h: Follow above changes. + + * include/ruby/ruby.h: Ditto. + Wed Jul 17 00:14:59 2013 Tanaka Akira * bignum.c (bigmul1_toom3): Use bigdivrem_single instead of bigdivrem. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2fd5981a67..91efa39db9 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1808,10 +1808,10 @@ int rb_toupper(int c); #define TOUPPER(c) rb_toupper((unsigned char)(c)) #define TOLOWER(c) rb_tolower((unsigned char)(c)) -int st_strcasecmp(const char *s1, const char *s2); -int st_strncasecmp(const char *s1, const char *s2, size_t n); -#define STRCASECMP(s1, s2) (st_strcasecmp((s1), (s2))) -#define STRNCASECMP(s1, s2, n) (st_strncasecmp((s1), (s2), (n))) +int st_locale_insensitive_strcasecmp(const char *s1, const char *s2); +int st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n); +#define STRCASECMP(s1, s2) (st_locale_insensitive_strcasecmp((s1), (s2))) +#define STRNCASECMP(s1, s2, n) (st_locale_insensitive_strncasecmp((s1), (s2), (n))) unsigned long ruby_strtoul(const char *str, char **endptr, int base); #define STRTOUL(str, endptr, base) (ruby_strtoul((str), (endptr), (base))) diff --git a/include/ruby/st.h b/include/ruby/st.h index 88135f6a38..d5ef4bd0ab 100644 --- a/include/ruby/st.h +++ b/include/ruby/st.h @@ -119,8 +119,8 @@ void st_clear(st_table *); st_table *st_copy(st_table *); int st_numcmp(st_data_t, st_data_t); st_index_t st_numhash(st_data_t); -int st_strcasecmp(const char *s1, const char *s2); -int st_strncasecmp(const char *s1, const char *s2, size_t n); +int st_locale_insensitive_strcasecmp(const char *s1, const char *s2); +int st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n); size_t st_memsize(const st_table *); st_index_t st_hash(const void *ptr, size_t len, st_index_t h); st_index_t st_hash_uint32(st_index_t h, uint32_t i); diff --git a/st.c b/st.c index e86171927b..6e3df628a7 100644 --- a/st.c +++ b/st.c @@ -67,7 +67,7 @@ static const struct st_hash_type type_strhash = { static st_index_t strcasehash(st_data_t); static const struct st_hash_type type_strcasehash = { - st_strcasecmp, + st_locale_insensitive_strcasecmp, strcasehash, }; @@ -1525,7 +1525,7 @@ strhash(st_data_t arg) #endif int -st_strcasecmp(const char *s1, const char *s2) +st_locale_insensitive_strcasecmp(const char *s1, const char *s2) { unsigned int c1, c2; @@ -1549,7 +1549,7 @@ st_strcasecmp(const char *s1, const char *s2) } int -st_strncasecmp(const char *s1, const char *s2, size_t n) +st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n) { unsigned int c1, c2; -- cgit v1.2.3