nobu	2010-07-17 14:10:22 +0900 (Sat, 17 Jul 2010)

  New Revision: 28664

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

  Log:
    * util.c (ruby_add_suffix): fixed type warnings.

  Modified files:
    trunk/ChangeLog
    trunk/util.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28663)
+++ ChangeLog	(revision 28664)
@@ -1,3 +1,7 @@
+Sat Jul 17 14:10:20 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* util.c (ruby_add_suffix): fixed type warnings.
+
 Sat Jul 17 13:48:22 2010  Tanaka Akira  <akr@f...>
 
 	* ext/pathname/lib/pathname.rb: moved from lib/pathname.rb.
Index: util.c
===================================================================
--- util.c	(revision 28663)
+++ util.c	(revision 28664)
@@ -266,9 +266,8 @@
 void
 ruby_add_suffix(VALUE str, const char *suffix)
 {
-    int baselen;
-    int extlen = strlen(suffix);
-    char *p, *q;
+    long baselen;
+    long extlen = strlen(suffix);
     long slen;
     char buf[1024];
     const char *name;
@@ -299,11 +298,12 @@
 	rb_str_cat(str, suffix, extlen);
     }
     else {
+	char *p = buf, *q;
 	strncpy(buf, name, slen);
 	if (ext)
-	    p = buf + (ext - name);
+	    p += (ext - name);
 	else
-	    p = buf + slen;
+	    p += slen;
 	p[len] = '\0';
 	if (suffix[1] == '\0') {  /* Style 2 */
 	    if (len <= 3) {

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