nobu	2010-10-13 00:21:20 +0900 (Wed, 13 Oct 2010)

  New Revision: 29471

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

  Log:
    * ext/syck/rubyext.c (struct mktime_arg): constified.
    
    * ext/syck/rubyext.c (mktime_do, mktime_r, rb_syck_mktime): fix
      function signatures.

  Modified files:
    trunk/ChangeLog
    trunk/ext/syck/rubyext.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29470)
+++ ChangeLog	(revision 29471)
@@ -1,3 +1,10 @@
+Wed Oct 13 00:21:17 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/syck/rubyext.c (struct mktime_arg): constified.
+
+	* ext/syck/rubyext.c (mktime_do, mktime_r, rb_syck_mktime): fix
+	  function signatures.
+
 Wed Oct 13 00:18:18 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* st.c (MurmurMagic): get rid of literal overflow.
Index: ext/syck/rubyext.c
===================================================================
--- ext/syck/rubyext.c	(revision 29470)
+++ ext/syck/rubyext.c	(revision 29471)
@@ -208,17 +208,18 @@
  * creating timestamps
  */
 struct mktime_arg {
-    char *str;
+    const char *str;
     long len;
 };
 
-SYMID
-mktime_do(struct mktime_arg *arg)
+VALUE
+mktime_do(VALUE varg)
 {
+    struct mktime_arg *arg = (struct mktime_arg *)varg;
     VALUE time;
-    char *str = arg->str;
+    const char *str = arg->str;
     long len = arg->len;
-    char *ptr = str;
+    const char *ptr = str;
     VALUE year = INT2FIX(0);
     VALUE mon = INT2FIX(0);
     VALUE day = INT2FIX(0);
@@ -272,8 +273,8 @@
     if ( len > ptr - str && *ptr == '.' )
     {
         char padded[] = "000000";
-        char *end = ptr + 1;
-        char *p = end;
+        const char *end = ptr + 1;
+        const char *p = end;
         while ( isdigit( *end ) ) end++;
         if (end - p < (int)sizeof(padded)) {
             MEMCPY(padded, ptr + 1, char, end - (ptr + 1));
@@ -320,9 +321,11 @@
     }
 }
 
-SYMID
-mktime_r(struct mktime_arg *arg)
+VALUE
+mktime_r(VALUE varg)
 {
+    struct mktime_arg *arg = (struct mktime_arg *)varg;
+
     if (!cDateTime) {
         /*
          * Load Date module
@@ -333,8 +336,8 @@
     return rb_funcall(cDateTime, s_parse, 1, rb_str_new(arg->str, arg->len));
 }
 
-SYMID
-rb_syck_mktime(char *str, long len)
+VALUE
+rb_syck_mktime(const char *str, long len)
 {
     struct mktime_arg a;
 

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