nobu	2008-06-02 05:28:01 +0900 (Mon, 02 Jun 2008)

  New Revision: 16741

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/io.c
    branches/ruby_1_8/marshal.c
    branches/ruby_1_8/pack.c
    branches/ruby_1_8/process.c

  Log:
    * io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
      (path2class, path2module): constified.
    
    * pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16741&r2=16740&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/process.c?r1=16741&r2=16740&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/pack.c?r1=16741&r2=16740&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/io.c?r1=16741&r2=16740&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/marshal.c?r1=16741&r2=16740&diff_format=u

Index: ruby_1_8/process.c
===================================================================
--- ruby_1_8/process.c	(revision 16740)
+++ ruby_1_8/process.c	(revision 16741)
@@ -1409,12 +1409,12 @@
 {
     static int overriding;
 #ifdef SIGHUP
-    RETSIGTYPE (*hfunc)_((int));
+    RETSIGTYPE (*hfunc)_((int)) = 0;
 #endif
 #ifdef SIGQUIT
-    RETSIGTYPE (*qfunc)_((int));
+    RETSIGTYPE (*qfunc)_((int)) = 0;
 #endif
-    RETSIGTYPE (*ifunc)_((int));
+    RETSIGTYPE (*ifunc)_((int)) = 0;
     int status;
     int i, hooked = Qfalse;
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16740)
+++ ruby_1_8/ChangeLog	(revision 16741)
@@ -1,3 +1,10 @@
+Mon Jun  2 05:27:58 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
+	  (path2class, path2module): constified.
+
+	* pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
+
 Mon Jun  2 04:55:05 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* suppress warnings on cygwin, mingw and mswin.
Index: ruby_1_8/io.c
===================================================================
--- ruby_1_8/io.c	(revision 16740)
+++ ruby_1_8/io.c	(revision 16741)
@@ -1681,7 +1681,7 @@
 
 static int
 rscheck(rsptr, rslen, rs)
-    char *rsptr;
+    const char *rsptr;
     long rslen;
     VALUE rs;
 {
Index: ruby_1_8/pack.c
===================================================================
--- ruby_1_8/pack.c	(revision 16740)
+++ ruby_1_8/pack.c	(revision 16741)
@@ -1884,8 +1884,8 @@
 
 	  case 'P':
 	    if (sizeof(char *) <= send - s) {
+		VALUE tmp = Qnil;
 		char *t;
-		VALUE tmp;
 
 		memcpy(&t, s, sizeof(char *));
 		s += sizeof(char *);
@@ -1915,9 +1915,6 @@
 			rb_raise(rb_eArgError, "non associated pointer");
 		    }
 		}
-		else {
-		    tmp = Qnil;
-		}
 		rb_ary_push(ary, tmp);
 	    }
 	    break;
@@ -1929,7 +1926,7 @@
 		if (send - s < sizeof(char *))
 		    break;
 		else {
-		    VALUE tmp;
+		    VALUE tmp = Qnil;
 		    char *t;
 
 		    memcpy(&t, s, sizeof(char *));
@@ -1954,9 +1951,6 @@
 			    rb_raise(rb_eArgError, "non associated pointer");
 			}
 		    }
-		    else {
-			tmp = Qnil;
-		    }
 		    rb_ary_push(ary, tmp);
 		}
 	    }
Index: ruby_1_8/marshal.c
===================================================================
--- ruby_1_8/marshal.c	(revision 16740)
+++ ruby_1_8/marshal.c	(revision 16741)
@@ -130,7 +130,7 @@
 
 static void
 w_nbyte(s, n, arg)
-    char *s;
+    const char *s;
     int n;
     struct dump_arg *arg;
 {
@@ -153,7 +153,7 @@
 
 static void
 w_bytes(s, n, arg)
-    char *s;
+    const char *s;
     int n;
     struct dump_arg *arg;
 {
@@ -354,7 +354,7 @@
 
 static void
 w_unique(s, arg)
-    char *s;
+    const char *s;
     struct dump_arg *arg;
 {
     if (s[0] == '#') {
@@ -991,7 +991,7 @@
 
 static VALUE
 path2class(path)
-    char *path;
+    const char *path;
 {
     VALUE v = rb_path2class(path);
 
@@ -1003,7 +1003,7 @@
 
 static VALUE
 path2module(path)
-    char *path;
+    const char *path;
 {
     VALUE v = rb_path2class(path);
 

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