mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ruby.h (struct RString): embed small strings.
(RSTRING_LEN): defined for accessing string members. (RSTRING_PTR): ditto. * string.c: use RSTRING_LEN and RSTRING_PTR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
22f249ebd7
commit
25c50cd193
43 changed files with 484 additions and 512 deletions
|
@ -40,7 +40,7 @@ VALUE eEngineError;
|
|||
*/
|
||||
#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
|
||||
do{\
|
||||
if(!strcmp(#x, RSTRING(name)->ptr)){\
|
||||
if(!strcmp(#x, RSTRING_PTR(name))){\
|
||||
ENGINE_load_##x();\
|
||||
return Qtrue;\
|
||||
}\
|
||||
|
@ -75,7 +75,7 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
|
|||
OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
|
||||
#endif
|
||||
OSSL_ENGINE_LOAD_IF_MATCH(openssl);
|
||||
rb_warning("no such builtin loader for `%s'", RSTRING(name)->ptr);
|
||||
rb_warning("no such builtin loader for `%s'", RSTRING_PTR(name));
|
||||
return Qnil;
|
||||
#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
|
||||
}
|
||||
|
@ -112,7 +112,7 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
|
|||
|
||||
StringValue(id);
|
||||
ossl_engine_s_load(1, &id, klass);
|
||||
if(!(e = ENGINE_by_id(RSTRING(id)->ptr)))
|
||||
if(!(e = ENGINE_by_id(RSTRING_PTR(id))))
|
||||
ossl_raise(eEngineError, NULL);
|
||||
WrapEngine(klass, obj, e);
|
||||
if(rb_block_given_p()) rb_yield(obj);
|
||||
|
@ -281,8 +281,8 @@ ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
|
|||
rb_scan_args(argc, argv, "11", &cmd, &val);
|
||||
StringValue(cmd);
|
||||
if (!NIL_P(val)) StringValue(val);
|
||||
ret = ENGINE_ctrl_cmd_string(e, RSTRING(cmd)->ptr,
|
||||
NIL_P(val) ? NULL : RSTRING(val)->ptr, 0);
|
||||
ret = ENGINE_ctrl_cmd_string(e, RSTRING_PTR(cmd),
|
||||
NIL_P(val) ? NULL : RSTRING_PTR(val), 0);
|
||||
if (!ret) ossl_raise(eEngineError, NULL);
|
||||
|
||||
return self;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue