protoize no-arguments functions

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
imasahiro · Sep 30, 2014 · 28b9f11 · 28b9f11
1 parent cf5450b
commit 28b9f11
Show file tree

Hide file tree

Showing 63 changed files with 104 additions and 99 deletions.
diff --git a/dir.c b/dir.c
@@ -2248,7 +2248,7 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
  *
  */
 VALUE
-rb_file_directory_p()
+rb_file_directory_p(void)
 {
 }
 #endif

diff --git a/eval.c b/eval.c
@@ -1132,7 +1132,7 @@ rb_mod_prepend(int argc, VALUE *argv, VALUE module)
 }
 
 static VALUE
-hidden_identity_hash_new()
+hidden_identity_hash_new(void)
 {
     VALUE hash = rb_hash_new();
 

diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
@@ -61,7 +61,7 @@
  */
 #include <string.h>
 int
-main()
+main(void)
 {
     static const char *const test[7*2] = {
 	"", "d41d8cd98f00b204e9800998ecf8427e",
@@ -102,7 +102,7 @@ main()
 #ifdef COMPUTE_T_VALUES
 #include <math.h>
 int
-main()
+main(void)
 {
     int i;
     for (i = 1; i <= 64; ++i) {

diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
@@ -24,7 +24,7 @@ static const rb_digest_metadata_t md5 = {
  * RFC1321.
  */
 void
-Init_md5()
+Init_md5(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_MD5;
 

diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
@@ -24,7 +24,7 @@ static const rb_digest_metadata_t rmd160 = {
  * Bosselaers, and Bart Preneel.
  */
 void
-Init_rmd160()
+Init_rmd160(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_RMD160;
 

diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
@@ -24,7 +24,7 @@ static const rb_digest_metadata_t sha1 = {
  * Technology), described in FIPS PUB 180-1.
  */
 void
-Init_sha1()
+Init_sha1(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_SHA1;
 

diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
@@ -29,7 +29,7 @@ FOREACH_BITLEN(DEFINE_ALGO_METADATA)
  * Standards and Technology), described in FIPS PUB 180-2.
  */
 void
-Init_sha2()
+Init_sha2(void)
 {
     VALUE mDigest, cDigest_Base;
     ID id_metadata;

diff --git a/ext/dl/callback/mkcallback.rb b/ext/dl/callback/mkcallback.rb
@@ -123,10 +123,15 @@ def foreach_proc_entry
 def gencallback(ty, calltype, proc_entry, argc, n)
   dltype = DLTYPE[ty]
   ret = dltype[:conv]
+  if argc == 0
+    args = "void"
+  else
+    args = (0...argc).collect{|i| "DLSTACK_TYPE stack#{i}"}.join(", ")
+  end
   src = <<-EOS
 #{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""}
 static #{dltype[:type]}
-FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack#{i}"}.join(", ")})
+FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{args})
 {
     VALUE #{ret ? "ret, " : ""}cb#{argc > 0 ? ", args[#{argc}]" : ""};
 #{
@@ -177,7 +182,7 @@ def gen_callback_file(ty)
   yield body
   body << <<-EOS
 void
-#{initname}()
+#{initname}(void)
 {
 #{gen_push_proc_ary(ty, "rb_DLCdeclCallbackProcs")}
 #{gen_push_addr_ary(ty, "rb_DLCdeclCallbackAddrs", CDECL)}
@@ -201,7 +206,7 @@ def gen_callback_file(ty)
       end
     end
   }
-  $out << "void #{initname}();\n"
+  $out << "void #{initname}(void);\n"
   callbacks << [filename, body]
 end
 

diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
@@ -62,7 +62,7 @@ pack up your own arguments to pass as args for locking functions, etc.
  *
  */
 void
-Init_fcntl()
+Init_fcntl(void)
 {
     VALUE mFcntl = rb_define_module("Fcntl");
 #ifdef F_DUPFD

diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
@@ -260,7 +260,7 @@ to_i(VALUE self)
 }
 
 void
-Init_fiddle_closure()
+Init_fiddle_closure(void)
 {
 #if 0
     mFiddle = rb_define_module("Fiddle"); /* let rdoc know about mFiddle */

diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
@@ -177,7 +177,7 @@ io_wait_writable(int argc, VALUE *argv, VALUE io)
  */
 
 void
-Init_wait()
+Init_wait(void)
 {
     rb_define_method(rb_cIO, "nread", io_nread, 0);
     rb_define_method(rb_cIO, "ready?", io_ready_p, 0);

diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
@@ -774,7 +774,7 @@ nkf_enc_find(const char *name)
 
 #ifdef DEFAULT_CODE_LOCALE
 static const char*
-nkf_locale_charmap()
+nkf_locale_charmap(void)
 {
 #ifdef HAVE_LANGINFO_H
     return nl_langinfo(CODESET);
@@ -802,7 +802,7 @@ nkf_locale_charmap()
 }
 
 static nkf_encoding*
-nkf_locale_encoding()
+nkf_locale_encoding(void)
 {
     nkf_encoding *enc = 0;
     const char *encname = nkf_locale_charmap();
@@ -813,13 +813,13 @@ nkf_locale_encoding()
 #endif /* DEFAULT_CODE_LOCALE */
 
 static nkf_encoding*
-nkf_utf8_encoding()
+nkf_utf8_encoding(void)
 {
     return &nkf_encoding_table[UTF_8];
 }
 
 static nkf_encoding*
-nkf_default_encoding()
+nkf_default_encoding(void)
 {
     nkf_encoding *enc = 0;
 #ifdef DEFAULT_CODE_LOCALE

diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
@@ -478,7 +478,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  */
 
 void
-Init_nkf()
+Init_nkf(void)
 {
     VALUE mNKF = rb_define_module("NKF");
 

diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
@@ -361,7 +361,7 @@ ossl_exc_new(VALUE exc, const char *fmt, ...)
  * Any errors you see here are probably due to a bug in ruby's OpenSSL implementation.
  */
 VALUE
-ossl_get_errors()
+ossl_get_errors(void)
 {
     VALUE ary;
     long e;
@@ -1034,7 +1034,7 @@ static void Init_ossl_locks(void)
  *
  */
 void
-Init_openssl()
+Init_openssl(void)
 {
     /*
      * Init timezone info

diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
@@ -1472,7 +1472,7 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
 OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 
 void
-Init_ossl_asn1()
+Init_ossl_asn1(void)
 {
     VALUE ary;
     int i;

diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
@@ -773,7 +773,7 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
  * (NOTE: ordering of methods is the same as in 'man bn')
  */
 void
-Init_ossl_bn()
+Init_ossl_bn(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */

diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
@@ -69,7 +69,7 @@ GetConfigPtr(VALUE obj)
  * INIT
  */
 void
-Init_ossl_config()
+Init_ossl_config(void)
 {
     char *default_config_file;
     eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);

diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
@@ -294,7 +294,7 @@ ossl_digest_block_length(VALUE self)
  * INIT
  */
 void
-Init_ossl_digest()
+Init_ossl_digest(void)
 {
     rb_require("digest");
 

diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
@@ -533,7 +533,7 @@ ossl_engine_inspect(VALUE self)
 #define DefEngineConst(x) rb_define_const(cEngine, #x, INT2NUM(ENGINE_##x))
 
 void
-Init_ossl_engine()
+Init_ossl_engine(void)
 {
     cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
     eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
@@ -578,7 +578,7 @@ Init_ossl_engine()
 }
 #else
 void
-Init_ossl_engine()
+Init_ossl_engine(void)
 {
 }
 #endif
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
@@ -327,7 +327,7 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
  * INIT
  */
 void
-Init_ossl_hmac()
+Init_ossl_hmac(void)
 {
 #if 0
     /* :nodoc: */
@@ -357,7 +357,7 @@ Init_ossl_hmac()
 #else /* NO_HMAC */
 #  warning >>> OpenSSL is compiled without HMAC support <<<
 void
-Init_ossl_hmac()
+Init_ossl_hmac(void)
 {
     rb_warning("HMAC is not available: OpenSSL is compiled without HMAC.");
 }

diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
@@ -360,7 +360,7 @@ ossl_spki_verify(VALUE self, VALUE key)
  */
 
 void
-Init_ossl_ns_spki()
+Init_ossl_ns_spki(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */

diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
@@ -900,7 +900,7 @@ ossl_ocspcid_get_serial(VALUE self)
 }
 
 void
-Init_ossl_ocsp()
+Init_ossl_ocsp(void)
 {
     /*
      * OpenSSL::OCSP implements Online Certificate Status Protocol requests
@@ -1182,7 +1182,7 @@ Init_ossl_ocsp()
 
 #else /* ! OSSL_OCSP_ENABLED */
 void
-Init_ossl_ocsp()
+Init_ossl_ocsp(void)
 {
 }
 #endif
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
@@ -192,7 +192,7 @@ ossl_pkcs12_to_der(VALUE self)
 }
 
 void
-Init_ossl_pkcs12()
+Init_ossl_pkcs12(void)
 {
     /*
      * Defines a file format commonly used to store private keys with

diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
@@ -87,7 +87,7 @@ ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALU
 #endif
 
 void
-Init_ossl_pkcs5()
+Init_ossl_pkcs5(void)
 {
     /*
      * Password-based Encryption

diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
@@ -980,7 +980,7 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
  * INIT
  */
 void
-Init_ossl_pkcs7()
+Init_ossl_pkcs7(void)
 {
     cPKCS7 = rb_define_class_under(mOSSL, "PKCS7", rb_cObject);
     ePKCS7Error = rb_define_class_under(cPKCS7, "PKCS7Error", eOSSLError);

diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
@@ -342,7 +342,7 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
  * INIT
  */
 void
-Init_ossl_pkey()
+Init_ossl_pkey(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */

diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
@@ -588,7 +588,7 @@ ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
  * INIT
  */
 void
-Init_ossl_dh()
+Init_ossl_dh(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
@@ -660,7 +660,7 @@ Init_ossl_dh()
 
 #else /* defined NO_DH */
 void
-Init_ossl_dh()
+Init_ossl_dh(void)
 {
 }
 #endif /* NO_DH */
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
@@ -563,7 +563,7 @@ OSSL_PKEY_BN(dsa, priv_key)
  * INIT
  */
 void
-Init_ossl_dsa()
+Init_ossl_dsa(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
@@ -617,7 +617,7 @@ Init_ossl_dsa()
 
 #else /* defined NO_DSA */
 void
-Init_ossl_dsa()
+Init_ossl_dsa(void)
 {
 }
 #endif /* NO_DSA */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
@@ -626,7 +626,7 @@ OSSL_PKEY_BN(rsa, iqmp)
 #define DefRSAConst(x) rb_define_const(cRSA, #x,INT2FIX(RSA_##x))
 
 void
-Init_ossl_rsa()
+Init_ossl_rsa(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
@@ -694,7 +694,7 @@ Init_ossl_rsa()
 
 #else /* defined NO_RSA */
 void
-Init_ossl_rsa()
+Init_ossl_rsa(void)
 {
 }
 #endif /* NO_RSA */

diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
@@ -179,7 +179,7 @@ ossl_rand_status(VALUE self)
  * INIT
  */
 void
-Init_ossl_rand()
+Init_ossl_rand(void)
 {
 #if 0
     mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
-Original file line number
+Diff line change
@@ Expand Up / @@ -2248,7 +2248,7 @@ dir_s_home(int argc, VALUE *argv, VALUE obj) @@
      *
      */
     VALUE
-    rb_file_directory_p()
+    rb_file_directory_p(void)
     {
     }
     #endif
@@ Expand Down @@