knu	2008-08-12 18:51:33 +0900 (Tue, 12 Aug 2008)

  New Revision: 18534

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

  Log:
    * ext/syslog/syslog.c (mSyslog_open): Use of Check_SafeStr() is
      deprecated.
      (mSyslogConstants_LOG_MASK, mSyslogConstants_LOG_UPTO): Use
      NUM2INT() instead of FIX2INT() when the type of an given object
      is not determined.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/syslog/syslog.c

Index: ruby_1_8/ext/syslog/syslog.c
===================================================================
--- ruby_1_8/ext/syslog/syslog.c	(revision 18533)
+++ ruby_1_8/ext/syslog/syslog.c	(revision 18534)
@@ -67,11 +67,7 @@
     if (NIL_P(ident)) {
         ident = rb_gv_get("$0"); 
     }
-#ifdef SafeStringValue
     SafeStringValue(ident);
-#else
-    Check_SafeStr(ident);
-#endif
     syslog_ident = strdup(RSTRING(ident)->ptr);
 
     if (NIL_P(opt)) {
@@ -224,12 +220,12 @@
 
 static VALUE mSyslogConstants_LOG_MASK(VALUE klass, VALUE pri)
 {
-    return INT2FIX(LOG_MASK(FIX2INT(pri)));
+    return INT2FIX(LOG_MASK(NUM2INT(pri)));
 }
 
 static VALUE mSyslogConstants_LOG_UPTO(VALUE klass, VALUE pri)
 {
-    return INT2FIX(LOG_UPTO(FIX2INT(pri)));
+    return INT2FIX(LOG_UPTO(NUM2INT(pri)));
 }
 
 /* Init for package syslog */
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18533)
+++ ruby_1_8/ChangeLog	(revision 18534)
@@ -1,3 +1,11 @@
+Tue Aug 12 18:50:58 2008  Akinori MUSHA  <knu@i...>
+
+	* ext/syslog/syslog.c (mSyslog_open): Use of Check_SafeStr() is
+	  deprecated.
+	  (mSyslogConstants_LOG_MASK, mSyslogConstants_LOG_UPTO): Use
+	  NUM2INT() instead of FIX2INT() when the type of an given object
+	  is not determined.
+
 Tue Aug 12 14:53:33 2008  Akinori MUSHA  <knu@i...>
 
 	* array.c (rb_ary_choice): Resurrect #choice.  Let me think about

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