From b0a379e3b0bd6d04a8ccf1f33a329f9c14b749c1 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 12 Dec 2014 21:57:49 +0000 Subject: ossl_engine.c: typed data * ext/openssl/ossl_engine.c (ossl_engine_type): use typed data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_engine.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'ext/openssl') diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 96bce5e283..04b5879bbc 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -16,10 +16,10 @@ if (!(engine)) { \ ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \ } \ - (obj) = Data_Wrap_Struct((klass), 0, ENGINE_free, (engine)); \ + (obj) = TypedData_Wrap_Struct((klass), &ossl_engine_type, (engine)); \ } while(0) #define GetEngine(obj, engine) do { \ - Data_Get_Struct((obj), ENGINE, (engine)); \ + TypedData_Get_Struct((obj), ENGINE, &ossl_engine_type, (engine)); \ if (!(engine)) { \ ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \ } \ @@ -57,6 +57,20 @@ do{\ }\ }while(0) +static void +ossl_engine_free(void *engine) +{ + ENGINE_free(engine); +} + +static const rb_data_type_t ossl_engine_type = { + "OpenSSL/Engine", + { + 0, ossl_engine_free, + }, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY, +}; + /* Document-method: OpenSSL::Engine.load * * call-seq: -- cgit v1.2.3