* ext/syslog/syslog.c: Merge from rough. Use SafeStringValue().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index caeef8f329..883212a05d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 25 21:22:41 2002  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/syslog.c: Merge from rough.  Use SafeStringValue().
+
 Mon Feb 25 21:12:08 2002  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/syslog/syslog.c: Merge from rough.  Turn Syslog into a
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 7e0e7d1984..22e1e02a87 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -3,7 +3,7 @@
  * Amos Gouaux, University of Texas at Dallas
  * <amos+ruby@utdallas.edu>
  *
- * $RoughId: syslog.c,v 1.20 2002/02/25 08:20:14 knu Exp $
+ * $RoughId: syslog.c,v 1.21 2002/02/25 12:21:17 knu Exp $
  * $Id$
  */
 
@@ -62,7 +62,11 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
         fac = INT2NUM(LOG_USER);
     }
 
+#ifdef SafeStringValue
+    SafeStringValue(ident);
+#else
     Check_SafeStr(ident);
+#endif
     syslog_ident = ident;
     syslog_options = opt;
     syslog_facility = fac;