[前][次][番号順一覧][スレッド一覧]

ruby-changes:29960

From: akr <ko1@a...>
Date: Wed, 17 Jul 2013 08:15:56 +0900 (JST)
Subject: [ruby-changes:29960] akr:r42012 (trunk): * st.c (st_locale_insensitive_strcasecmp): Renamed from st_strcasecmp.

akr	2013-07-17 08:15:41 +0900 (Wed, 17 Jul 2013)

  New Revision: 42012

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42012

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/ruby.h
    trunk/include/ruby/st.h
    trunk/st.c

Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 42011)
+++ include/ruby/ruby.h	(revision 42012)
@@ -1808,10 +1808,10 @@ int rb_toupper(int c); https://github.com/ruby/ruby/blob/trunk/include/ruby/ruby.h#L1808
 #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)))
Index: include/ruby/st.h
===================================================================
--- include/ruby/st.h	(revision 42011)
+++ include/ruby/st.h	(revision 42012)
@@ -119,8 +119,8 @@ void st_clear(st_table *); https://github.com/ruby/ruby/blob/trunk/include/ruby/st.h#L119
 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);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42011)
+++ ChangeLog	(revision 42012)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jul 17 08:12:41 2013  Tanaka Akira  <akr@f...>
+
+	* 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@f...>
 
 	* bignum.c (bigmul1_toom3): Use bigdivrem_single instead of bigdivrem.
Index: st.c
===================================================================
--- st.c	(revision 42011)
+++ st.c	(revision 42012)
@@ -67,7 +67,7 @@ static const struct st_hash_type type_st https://github.com/ruby/ruby/blob/trunk/st.c#L67
 
 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) https://github.com/ruby/ruby/blob/trunk/st.c#L1525
 #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 https://github.com/ruby/ruby/blob/trunk/st.c#L1549
 }
 
 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;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]