diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-01 22:49:05 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-01 22:49:05 +0000 |
| commit | ebcefd795bc800d1c3da97d2c4b11ee05b522d9b (patch) | |
| tree | 7df0d504669cdcc4595f861056d7c2a83012de42 /ext/openssl | |
| parent | fd8f7848b4d7a0280cb538745c89811df4022198 (diff) | |
ext/openssl/ossl_ssl.c: hide globals
* ext/openssl/ossl_ssl.c (mSSLExtConfig): make static
(eSSLError): ditto
(ID_callback_state): ditto
(ossl_ssl_ex_vcb_idx): ditto
(ossl_ssl_ex_store_p): ditto
(ossl_ssl_ex_ptr_idx): ditto
* ext/openssl/ossl_ssl.h: remove extern declarations for
mSSLExtConfig and eSSLError
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 12 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.h | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 538ba37f24..553eb14252 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -28,8 +28,8 @@ } while (0) VALUE mSSL; -VALUE mSSLExtConfig; -VALUE eSSLError; +static VALUE mSSLExtConfig; +static VALUE eSSLError; VALUE cSSLContext; VALUE cSSLSocket; @@ -75,7 +75,7 @@ static VALUE eSSLErrorWaitWritable; #define ossl_ssl_set_tmp_dh(o,v) rb_iv_set((o),"@tmp_dh",(v)) #define ossl_ssl_set_tmp_ecdh(o,v) rb_iv_set((o),"@tmp_ecdh",(v)) -ID ID_callback_state; +static ID ID_callback_state; static VALUE sym_exception, sym_wait_readable, sym_wait_writable; @@ -120,9 +120,9 @@ static const struct { #undef OSSL_SSL_METHOD_ENTRY }; -int ossl_ssl_ex_vcb_idx; -int ossl_ssl_ex_store_p; -int ossl_ssl_ex_ptr_idx; +static int ossl_ssl_ex_vcb_idx; +static int ossl_ssl_ex_store_p; +static int ossl_ssl_ex_ptr_idx; static void ossl_sslctx_free(void *ptr) diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h index f92f0289d6..909f6798c4 100644 --- a/ext/openssl/ossl_ssl.h +++ b/ext/openssl/ossl_ssl.h @@ -29,9 +29,7 @@ extern const rb_data_type_t ossl_ssl_type; extern const rb_data_type_t ossl_ssl_session_type; extern VALUE mSSL; -extern VALUE eSSLError; extern VALUE cSSLSocket; -extern VALUE cSSLContext; extern VALUE cSSLSession; void Init_ossl_ssl(void); |