1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
akr 2013-07-16 23:15:41 +00:00
parent adba373c7f
commit 8795574510
4 changed files with 18 additions and 9 deletions

View file

@ -1,3 +1,12 @@
Wed Jul 17 08:12:41 2013 Tanaka Akira <akr@fsij.org>
* 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 <akr@fsij.org>
* bignum.c (bigmul1_toom3): Use bigdivrem_single instead of bigdivrem.

View file

@ -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)))

View file

@ -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);

6
st.c
View file

@ -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;