1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/ruby/ruby.h (rb_check_safe_str): deprecated.

Browse Source 
* ext/openssl/ossl_x509store.c (ossl_x509store_add_{file,path}):
  replaced deprecated funtion.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-14 11:03:22 +00:00
parent 4155811dc1
commit 19b24f499b
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Aug 14 20:03:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (rb_check_safe_str): deprecated.
* ext/openssl/ossl_x509store.c (ossl_x509store_add_{file,path}):
replaced deprecated funtion.
Fri Aug 14 17:59:12 2009 NARUSE, Yui <naruse@ruby-lang.org> Fri Aug 14 17:59:12 2009 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_preprocess_dregexp): change Exception class to * re.c (rb_reg_preprocess_dregexp): change Exception class to

4
ext/openssl/ossl_x509store.c
View File

@ -211,7 +211,7 @@ ossl_x509store_add_file(VALUE self, VALUE file)
char *path = NULL; char *path = NULL;
if(file != Qnil){ if(file != Qnil){
Check_SafeStr(file); SafeStringValue(file);
path = RSTRING_PTR(file); path = RSTRING_PTR(file);
} }
GetX509Store(self, store); GetX509Store(self, store);
@ -232,7 +232,7 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
char *path = NULL; char *path = NULL;
if(dir != Qnil){ if(dir != Qnil){
Check_SafeStr(dir); SafeStringValue(dir);
path = RSTRING_PTR(dir); path = RSTRING_PTR(dir);
} }
GetX509Store(self, store); GetX509Store(self, store);

2
include/ruby/ruby.h
View File

@ -401,7 +401,7 @@ char *rb_string_value_cstr(volatile VALUE*);
#define StringValueCStr(v) rb_string_value_cstr(&(v)) #define StringValueCStr(v) rb_string_value_cstr(&(v))
void rb_check_safe_obj(VALUE); void rb_check_safe_obj(VALUE);
void rb_check_safe_str(VALUE); DEPRECATED(void rb_check_safe_str(VALUE));
#define SafeStringValue(v) do {\ #define SafeStringValue(v) do {\
StringValue(v);\ StringValue(v);\
rb_check_safe_obj(v);\ rb_check_safe_obj(v);\