nagachika	2013-06-23 00:05:31 +0900 (Sun, 23 Jun 2013)

  New Revision: 41575

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

  Log:
    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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/etc/etc.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41574)
+++ ruby_2_0_0/ChangeLog	(revision 41575)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jun 23 00:03:18 2013  Charlie Somerville  <charliesome@r...>
+
+	* 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@s...>
 
 	* lib/rubygems:  Update to RubyGems 2.0.3
Index: ruby_2_0_0/ext/etc/etc.c
===================================================================
--- ruby_2_0_0/ext/etc/etc.c	(revision 41574)
+++ ruby_2_0_0/ext/etc/etc.c	(revision 41575)
@@ -185,7 +185,7 @@ etc_getpwnam(VALUE obj, VALUE nam) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/etc/etc.c#L185
 
     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) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/etc/etc.c#L431
     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;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41574)
+++ ruby_2_0_0/version.h	(revision 41575)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41558


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