archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 41558: [Backport #8561]

Browse source 
* 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
This commit is contained in:
nagachika 2013-06-22 15:05:31 +00:00
parent 9bf4a463ab
commit 2d3482ac74
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Sat Jun 22 00:54:41 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems 2.0.3 * lib/rubygems: Update to RubyGems 2.0.3

4
ext/etc/etc.c
View file

@ -185,7 +185,7 @@ etc_getpwnam(VALUE obj, VALUE nam)
SafeStringValue(nam); SafeStringValue(nam);
pwd = getpwnam(RSTRING_PTR(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); return setup_passwd(pwd);
#else #else
return Qnil; return Qnil;
@ -431,7 +431,7 @@ etc_getgrnam(VALUE obj, VALUE nam)
rb_secure(4); rb_secure(4);
SafeStringValue(nam); SafeStringValue(nam);
grp = getgrnam(RSTRING_PTR(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); return setup_group(grp);
#else #else
return Qnil; return Qnil;

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-22" #define RUBY_RELEASE_DATE "2013-06-23"
#define RUBY_PATCHLEVEL 236 #define RUBY_PATCHLEVEL 237
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 22 #define RUBY_RELEASE_DAY 23
#include "ruby/version.h" #include "ruby/version.h"