aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-21 07:18:47 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-21 07:18:47 +0000
commit28fc368955fc94726ec95fcecb1f2aeab6d1aa64 (patch)
tree6201614c19187747428475c12d0f48b22f418723
parent1b84082a613b7bf3a6a9380b095ee4df4f551011 (diff)
downloadruby-28fc368955fc94726ec95fcecb1f2aeab6d1aa64.tar.gz
* ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/syslog/syslog.c23
2 files changed, 11 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a04fb1231..c6ac8823ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Mon May 21 15:02:37 2012 Akinori MUSHA <knu@iDaemons.org>
+Mon May 21 15:10:28 2012 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().
* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
module before calling rb_class2name().
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index a0b3ed3af7..14544cfc0d 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -313,24 +313,17 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
*/
static VALUE mSyslog_inspect(VALUE self)
{
- char buf[1024];
-
Check_Type(self, T_MODULE);
- if (syslog_opened) {
- snprintf(buf, sizeof(buf),
- "<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
- rb_class2name(self),
- syslog_ident,
- syslog_options,
- syslog_facility,
- syslog_mask);
- } else {
- snprintf(buf, sizeof(buf),
- "<#%s: opened=false>", rb_class2name(self));
- }
+ if (!syslog_opened)
+ return rb_sprintf("<#%s: opened=false>", rb_class2name(self));
- return rb_str_new2(buf);
+ return rb_sprintf("<#%s: opened=true, ident=\"%s\", options=%d, facility=%d, mask=%d>",
+ rb_class2name(self),
+ syslog_ident,
+ syslog_options,
+ syslog_facility,
+ syslog_mask);
}
/* Returns self, for backward compatibility.