From d04cc54add30205e99848f9a44e08fd35efc133f Mon Sep 17 00:00:00 2001 From: knu Date: Tue, 12 Aug 2008 09:35:12 +0000 Subject: * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/syslog/syslog.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ext/syslog') diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c index 4503e35461..1bd82bf7d0 100644 --- a/ext/syslog/syslog.c +++ b/ext/syslog/syslog.c @@ -67,11 +67,7 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self) if (NIL_P(ident)) { ident = rb_gv_get("$0"); } -#ifdef SafeStringValue SafeStringValue(ident); -#else - Check_SafeStr(ident); -#endif syslog_ident = strdup(RSTRING_PTR(ident)); if (NIL_P(opt)) { @@ -224,12 +220,12 @@ define_syslog_shortcut_method(LOG_DEBUG, debug) 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 */ -- cgit v1.2.3