ruby-changes:40763
From: normal <ko1@a...>
Date: Wed, 2 Dec 2015 07:49:10 +0900 (JST)
Subject: [ruby-changes:40763] normal:r52842 (trunk): ext/openssl/ossl_ssl.c: hide globals
normal 2015-12-02 07:49:05 +0900 (Wed, 02 Dec 2015) New Revision: 52842 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52842 Log: 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 Modified files: trunk/ChangeLog trunk/ext/openssl/ossl_ssl.c trunk/ext/openssl/ossl_ssl.h Index: ChangeLog =================================================================== --- ChangeLog (revision 52841) +++ ChangeLog (revision 52842) @@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Wed Dec 2 07:43:51 2015 Eric Wong <e@8...> + + * 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 + Wed Dec 2 07:41:08 2015 Eric Wong <e@8...> * missing/explicit_bzero.c (explicit_bzero): fixup r52839 Index: ext/openssl/ossl_ssl.c =================================================================== --- ext/openssl/ossl_ssl.c (revision 52841) +++ ext/openssl/ossl_ssl.c (revision 52842) @@ -28,8 +28,8 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L28 } 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; https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L75 #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 { https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L120 #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) Index: ext/openssl/ossl_ssl.h =================================================================== --- ext/openssl/ossl_ssl.h (revision 52841) +++ ext/openssl/ossl_ssl.h (revision 52842) @@ -29,9 +29,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.h#L29 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); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/