diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-22 15:05:31 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-22 15:05:31 +0000 |
commit | 2d3482ac7451df8c90cbf8dc076cae17ecfa136c (patch) | |
tree | a209e4fba79b56a28fe3867449df672023ef44f5 | |
parent | 9bf4a463ab785af3be6e39f42065d787f0bb251e (diff) |
merge revision(s) 41558: [Backport #8561]
* ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead
of %s and RSTRING_PTR
* ext/etc/etc.c (etc_getgrnam): ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/etc/etc.c | 4 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Sun Jun 23 00:03:18 2013 Charlie Somerville <charliesome@ruby-lang.org> + + * ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead + of %s and RSTRING_PTR + + * ext/etc/etc.c (etc_getgrnam): ditto + Sat Jun 22 00:54:41 2013 Eric Hodel <drbrain@segment7.net> * lib/rubygems: Update to RubyGems 2.0.3 diff --git a/ext/etc/etc.c b/ext/etc/etc.c index a511baf1a5..dbf854404b 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -185,7 +185,7 @@ etc_getpwnam(VALUE obj, VALUE nam) SafeStringValue(nam); pwd = getpwnam(RSTRING_PTR(nam)); - if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING_PTR(nam)); + if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam); return setup_passwd(pwd); #else return Qnil; @@ -431,7 +431,7 @@ etc_getgrnam(VALUE obj, VALUE nam) rb_secure(4); SafeStringValue(nam); grp = getgrnam(RSTRING_PTR(nam)); - if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(nam)); + if (grp == 0) rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, nam); return setup_group(grp); #else return Qnil; @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-06-22" -#define RUBY_PATCHLEVEL 236 +#define RUBY_RELEASE_DATE "2013-06-23" +#define RUBY_PATCHLEVEL 237 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" |