kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil

Browse source 
if the specified value doesn't exist.

* lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
  a empty hash if the specified section doesn't exist.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2003-11-10 18:31:36 +00:00
parent ea00e4e454
commit 09306bcead
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Tue Nov 11 03:30:43 JST 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
if the specified value doesn't exist.
* lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
a empty hash if the specified section doesn't exist.
Mon Nov 10 11:40:29 2003 Shugo Maeda <shugo@ruby-lang.org> Mon Nov 10 11:40:29 2003 Shugo Maeda <shugo@ruby-lang.org>
* lib/monitor.rb (wait): return true on signal/broadcastfalse and * lib/monitor.rb (wait): return true on signal/broadcastfalse and

10
ext/openssl/ossl_config.c
View file

@ -199,7 +199,10 @@ ossl_config_get_value(VALUE self, VALUE section, VALUE name)
StringValue(section); StringValue(section);
StringValue(name); StringValue(name);
str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr); str = NCONF_get_string(conf, RSTRING(section)->ptr, RSTRING(name)->ptr);
if(!str) ossl_raise(eConfigError, NULL); if(!str){
ERR_clear_error();
return Qnil;
}
return rb_str_new2(str); return rb_str_new2(str);
} }
@ -257,11 +260,12 @@ ossl_config_get_section(VALUE self, VALUE section)
int i, entries; int i, entries;
VALUE hash; VALUE hash;
hash = rb_hash_new();
GetConfig(self, conf); GetConfig(self, conf);
if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) { if (!(sk = NCONF_get_section(conf, StringValuePtr(section)))) {
ossl_raise(eConfigError, NULL); ERR_clear_error();
return hash;
} }
hash = rb_hash_new();
if ((entries = sk_CONF_VALUE_num(sk)) < 0) { if ((entries = sk_CONF_VALUE_num(sk)) < 0) {
OSSL_Debug("# of items in section is < 0?!?"); OSSL_Debug("# of items in section is < 0?!?");
return hash; return hash;