* regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan

matz · matz · commit 33163ad123a1 · 2007-03-19T03:58:57.000Z
Huehner &lt;stefan at huehner.org&gt;.  [ruby-core:10543]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 19 12:13:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan
+	  Huehner <stefan at huehner.org>.  [ruby-core:10543]
+
 Mon Mar 19 11:27:13 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
diff --git a/debug.h b/debug.h
@@ -24,7 +24,7 @@ VALUE ruby_debug_value(int level, int debug_level, char *header, VALUE v);
 ID    ruby_debug_id(int level, int debug_level, char *header, ID id);
 void  ruby_debug_indent(int level, int debug_level, int indent_level);
 void  ruby_debug_breakpoint(void);
-void  ruby_debug_gc_check_func();
+void  ruby_debug_gc_check_func(void);
 
 #if GCDEBUG == 1
 
diff --git a/error.c b/error.c
@@ -26,8 +26,8 @@
 extern const char ruby_version[], ruby_release_date[], ruby_platform[];
 int ruby_nerrs;
 
-const char *rb_sourcefile();
-int rb_sourceline();
+const char *rb_sourcefile(void);
+int rb_sourceline(void);
 
 static int
 err_position(char *buf, long len)
@@ -148,7 +148,7 @@ rb_warn_m(VALUE self, VALUE mesg)
     return Qnil;
 }
 
-void yarv_bug();
+void yarv_bug(void);
 
 void
 rb_bug(const char *fmt, ...)
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
@@ -72,9 +72,9 @@ struct windata {
 
 #define CHECK(c) c
 
-static VALUE window_attroff();
-static VALUE window_attron();
-static VALUE window_attrset();
+static VALUE window_attroff(VALUE obj, VALUE attrs);
+static VALUE window_attron(VALUE obj, VALUE attrs);
+static VALUE window_attrset(VALUE obj, VALUE attrs);
 
 static void
 no_window(void)
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
@@ -164,14 +164,14 @@ etc_getpwnam(VALUE obj, VALUE nam)
 #ifdef HAVE_GETPWENT
 static int passwd_blocking = 0;
 static VALUE
-passwd_ensure()
+passwd_ensure(void)
 {
     passwd_blocking = Qfalse;
     return Qnil;
 }
 
 static VALUE
-passwd_iterate()
+passwd_iterate(void)
 {
     struct passwd *pw;
 
@@ -368,14 +368,14 @@ etc_getgrnam(VALUE obj, VALUE nam)
 #ifdef HAVE_GETGRENT
 static int group_blocking = 0;
 static VALUE
-group_ensure()
+group_ensure(void)
 {
     group_blocking = Qfalse;
     return Qnil;
 }
 
 static VALUE
-group_iterate()
+group_iterate(void)
 {
     struct group *pw;
 
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
@@ -750,7 +750,7 @@ bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
 }
 
 static VALUE
-bsock_do_not_rev_lookup()
+bsock_do_not_rev_lookup(void)
 {
     return do_not_reverse_lookup?Qtrue:Qfalse;
 }
diff --git a/ext/syck/node.c b/ext/syck/node.c
@@ -46,7 +46,7 @@ syck_free_node( SyckNode *n )
 }
 
 SyckNode *
-syck_alloc_map()
+syck_alloc_map(void)
 {
     SyckNode *n;
     struct SyckMap *m;
@@ -65,7 +65,7 @@ syck_alloc_map()
 }
 
 SyckNode *
-syck_alloc_seq()
+syck_alloc_seq(void)
 {
     SyckNode *n;
     struct SyckSeq *s;
@@ -83,7 +83,7 @@ syck_alloc_seq()
 }
 
 SyckNode *
-syck_alloc_str()
+syck_alloc_str(void)
 {
     SyckNode *n;
     struct SyckStr *s;
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
@@ -60,10 +60,10 @@ static VALUE oDefaultResolver, oGenericResolver;
 /*
  * my private collection of numerical oddities.
  */
-static double S_zero()    { return 0.0; }
-static double S_one() { return 1.0; }
-static double S_inf() { return S_one() / S_zero(); }
-static double S_nan() { return S_zero() / S_zero(); }
+static double S_zero(void)    { return 0.0; }
+static double S_one(void) { return 1.0; }
+static double S_inf(void) { return S_one() / S_zero(); }
+static double S_nan(void) { return S_zero() / S_zero(); }
 
 static VALUE syck_node_transform( VALUE );
 
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
@@ -155,7 +155,7 @@ syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
  * Allocate the parser
  */
 SyckParser *
-syck_new_parser()
+syck_new_parser(void)
 {
     SyckParser *p;
     p = S_ALLOC( SyckParser );
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
@@ -390,7 +390,7 @@ SyckLevel *syck_emitter_parent_level( SyckEmitter * );
 void syck_emitter_pop_level( SyckEmitter * );
 void syck_emitter_add_level( SyckEmitter *, int, enum syck_level_status );
 void syck_emitter_reset_levels( SyckEmitter * );
-SyckParser *syck_new_parser();
+SyckParser *syck_new_parser(void);
 void syck_free_parser( SyckParser * );
 void syck_parser_set_root_on_error( SyckParser *, SYMID );
 void syck_parser_implicit_typing( SyckParser *, int );
@@ -416,9 +416,9 @@ char *syck_yaml2byte( char * );
 /*
  * Allocation prototypes
  */
-SyckNode *syck_alloc_map();
-SyckNode *syck_alloc_seq();
-SyckNode *syck_alloc_str();
+SyckNode *syck_alloc_map(void);
+SyckNode *syck_alloc_seq(void);
+SyckNode *syck_alloc_str(void);
 void syck_free_node( SyckNode * );
 void syck_free_members( SyckNode * );
 SyckNode *syck_new_str( const char *, enum scalar_style );
diff --git a/oniguruma.h b/oniguruma.h
@@ -425,11 +425,11 @@ OnigUChar* onigenc_step_back P_((OnigEncoding enc, const OnigUChar* start, const
 
 /* encoding API */
 ONIG_EXTERN
-int onigenc_init P_(());
+int onigenc_init P_((void));
 ONIG_EXTERN
 int onigenc_set_default_encoding P_((OnigEncoding enc));
 ONIG_EXTERN
-OnigEncoding onigenc_get_default_encoding P_(());
+OnigEncoding onigenc_get_default_encoding P_((void));
 ONIG_EXTERN
 void  onigenc_set_default_caseconv_table P_((const OnigUChar* table));
 ONIG_EXTERN
@@ -888,7 +888,7 @@ int onig_set_meta_char P_((OnigEncoding enc, unsigned int what, OnigCodePoint co
 ONIG_EXTERN
 void onig_copy_encoding P_((OnigEncoding to, OnigEncoding from));
 ONIG_EXTERN
-OnigAmbigType onig_get_default_ambig_flag P_(());
+OnigAmbigType onig_get_default_ambig_flag P_((void));
 ONIG_EXTERN
 int onig_set_default_ambig_flag P_((OnigAmbigType ambig_flag));
 ONIG_EXTERN
diff --git a/regcomp.c b/regcomp.c
@@ -34,7 +34,7 @@ OnigAmbigType OnigDefaultAmbigFlag =
    ONIGENC_AMBIGUOUS_MATCH_NONASCII_CASE);
 
 extern OnigAmbigType
-onig_get_default_ambig_flag()
+onig_get_default_ambig_flag(void)
 {
   return OnigDefaultAmbigFlag;
 }
@@ -5402,9 +5402,9 @@ onig_init()
 
 
 extern int
-onig_end()
+onig_end(void)
 {
-  extern int onig_free_shared_cclass_table();
+  extern int onig_free_shared_cclass_table(void);
 
   THREAD_ATOMIC_START;
 
diff --git a/regenc.c b/regenc.c
@@ -32,13 +32,13 @@
 OnigEncoding OnigEncDefaultCharEncoding = ONIG_ENCODING_INIT_DEFAULT;
 
 extern int
-onigenc_init()
+onigenc_init(void)
 {
   return 0;
 }
 
 extern OnigEncoding
-onigenc_get_default_encoding()
+onigenc_get_default_encoding(void)
 {
   return OnigEncDefaultCharEncoding;
 }
diff --git a/regparse.c b/regparse.c
@@ -1088,7 +1088,7 @@ onig_node_free(Node* node)
 
 #ifdef USE_RECYCLE_NODE
 extern int
-onig_free_node_list()
+onig_free_node_list(void)
 {
   FreeNode* n;
 
@@ -1104,7 +1104,7 @@ onig_free_node_list()
 #endif
 
 static Node*
-node_new()
+node_new(void)
 {
   Node* node;
 
@@ -1133,7 +1133,7 @@ initialize_cclass(CClassNode* cc)
 }
 
 static Node*
-node_new_cclass()
+node_new_cclass(void)
 {
   Node* node = node_new();
   CHECK_NULL_RETURN(node);
@@ -1202,7 +1202,7 @@ node_new_ctype(int type)
 }
 
 static Node*
-node_new_anychar()
+node_new_anychar(void)
 {
   Node* node = node_new();
   CHECK_NULL_RETURN(node);
@@ -1490,7 +1490,7 @@ node_new_str_raw(UChar* s, UChar* end)
 }
 
 static Node*
-node_new_empty()
+node_new_empty(void)
 {
   return node_new_str(NULL, NULL);
 }
@@ -4826,7 +4826,7 @@ i_free_shared_class(type_cclass_key* key, Node* node, void* arg)
 }
 
 extern int
-onig_free_shared_cclass_table()
+onig_free_shared_cclass_table(void)
 {
   if (IS_NOT_NULL(OnigTypeCClassTable)) {
     onig_st_foreach(OnigTypeCClassTable, i_free_shared_class, 0);
diff --git a/regparse.h b/regparse.h
@@ -315,7 +315,7 @@ extern Node*  onig_node_new_anchor P_((int type));
 extern Node*  onig_node_new_str P_((const UChar* s, const UChar* end));
 extern Node*  onig_node_new_list P_((Node* left, Node* right));
 extern void   onig_node_str_clear P_((Node* node));
-extern int    onig_free_node_list();
+extern int    onig_free_node_list(void);
 extern int    onig_names_free P_((regex_t* reg));
 extern int    onig_parse_make_tree P_((Node** root, const UChar* pattern, const UChar* end, regex_t* reg, ScanEnv* env));
 
diff --git a/ruby.h b/ruby.h
@@ -291,7 +291,7 @@ VALUE rb_get_path(VALUE);
 #define FilePathValue(v) ((v) = rb_get_path(v))
 
 void rb_secure(int);
-int rb_safe_level();
+int rb_safe_level(void);
 void rb_set_safe_level(int);
 void rb_set_safe_level_force(int);
 void rb_secure_update(VALUE);
diff --git a/thread.c b/thread.c
@@ -53,7 +53,6 @@
 #define THREAD_DEBUG 0
 #endif
 
-static void sleep_for_polling();
 static void sleep_timeval(rb_thread_t *th, struct timeval time);
 static void sleep_wait_for_interrupt(rb_thread_t *th, double sleepsec);
 static void sleep_forever(rb_thread_t *th);
@@ -62,7 +61,7 @@ struct timeval rb_time_interval(VALUE);
 static int rb_thread_dead(rb_thread_t *th);
 
 void rb_signal_exec(rb_thread_t *th, int sig);
-void rb_disable_interrupt();
+void rb_disable_interrupt(void);
 
 static VALUE eKillSignal = INT2FIX(0);
 static VALUE eTerminateSignal = INT2FIX(1);
@@ -595,7 +594,7 @@ rb_thread_sleep(int sec)
 }
 
 void
-rb_thread_schedule()
+rb_thread_schedule(void)
 {
     thread_debug("rb_thread_schedule\n");
     if (!rb_thread_alone()) {
@@ -722,7 +721,7 @@ rb_thread_execute_interrupts(rb_thread_t *th)
 
 
 void
-rb_gc_mark_threads()
+rb_gc_mark_threads(void)
 {
     /* TODO: remove */
 }
@@ -905,7 +904,7 @@ rb_thread_s_kill(VALUE obj, VALUE th)
  */
 
 static VALUE
-rb_thread_exit()
+rb_thread_exit(void)
 {
     return rb_thread_kill(GET_THREAD()->self);
 }
@@ -1094,7 +1093,7 @@ rb_thread_s_main(VALUE klass)
  */
 
 static VALUE
-rb_thread_s_abort_exc()
+rb_thread_s_abort_exc(void)
 {
     return GET_THREAD()->vm->thread_abort_on_exception ? Qtrue : Qfalse;
 }
@@ -1980,8 +1979,7 @@ thgroup_list(VALUE group)
  */
 
 VALUE
-thgroup_enclose(group)
-    VALUE group;
+thgroup_enclose(VALUE group)
 {
     struct thgroup *data;
 
@@ -2501,7 +2499,7 @@ Init_Thread(void)
 }
 
 VALUE
-is_ruby_native_thread()
+is_ruby_native_thread(void)
 {
     return Qtrue;
 }
diff --git a/util.c b/util.c
@@ -393,9 +393,7 @@ __crt0_glob_function(char *path)
 
 #define mmarg mmkind, size, high, low
 
-static void mmswap_(a, b, mmarg)
-    register char *a, *b;
-    int mmarg;
+static void mmswap_(register char *a, register char *b, int mmkind, int size, int high, int low)
 {
  register int s;
  if (a == b) return;
@@ -420,9 +418,7 @@ static void mmswap_(a, b, mmarg)
 }
 #define mmswap(a,b) mmswap_((a),(b),mmarg)
 
-static void mmrot3_(a, b, c, mmarg)
-    register char *a, *b, *c;
-    int mmarg;
+static void mmrot3_(register char *a, register char *b, register char *c, int mmkind, int size, int high, int low)
 {
  register int s;
  if (mmkind >= 0) {
diff --git a/vm.c b/vm.c
diff --git a/vm_dump.c b/vm_dump.c
diff --git a/yarvcore.h b/yarvcore.h

Original file line number	Diff line number	Diff line change
`@@ -164,14 +164,14 @@ etc_getpwnam(VALUE obj, VALUE nam)`
`164`	`164`	`#ifdef HAVE_GETPWENT`
`165`	`165`	`static int passwd_blocking = 0;`
`166`	`166`	`static VALUE`
`167`		`-passwd_ensure()`
	`167`	`+passwd_ensure(void)`
`168`	`168`	`{`
`169`	`169`	`passwd_blocking = Qfalse;`
`170`	`170`	`return Qnil;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`static VALUE`
`174`		`-passwd_iterate()`
	`174`	`+passwd_iterate(void)`
`175`	`175`	`{`
`176`	`176`	`struct passwd *pw;`
`177`	`177`
`@@ -368,14 +368,14 @@ etc_getgrnam(VALUE obj, VALUE nam)`
`368`	`368`	`#ifdef HAVE_GETGRENT`
`369`	`369`	`static int group_blocking = 0;`
`370`	`370`	`static VALUE`
`371`		`-group_ensure()`
	`371`	`+group_ensure(void)`
`372`	`372`	`{`
`373`	`373`	`group_blocking = Qfalse;`
`374`	`374`	`return Qnil;`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`static VALUE`
`378`		`-group_iterate()`
	`378`	`+group_iterate(void)`
`379`	`379`	`{`
`380`	`380`	`struct group *pw;`
`381`	`381`
Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`static VALUE`
`753`		`-bsock_do_not_rev_lookup()`
	`753`	`+bsock_do_not_rev_lookup(void)`
`754`	`754`	`{`
`755`	`755`	`return do_not_reverse_lookup?Qtrue:Qfalse;`
`756`	`756`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ syck_free_node( SyckNode *n )`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`SyckNode *`
`49`		`-syck_alloc_map()`
	`49`	`+syck_alloc_map(void)`
`50`	`50`	`{`
`51`	`51`	`SyckNode *n;`
`52`	`52`	`struct SyckMap *m;`
`@@ -65,7 +65,7 @@ syck_alloc_map()`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`SyckNode *`
`68`		`-syck_alloc_seq()`
	`68`	`+syck_alloc_seq(void)`
`69`	`69`	`{`
`70`	`70`	`SyckNode *n;`
`71`	`71`	`struct SyckSeq *s;`
`@@ -83,7 +83,7 @@ syck_alloc_seq()`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`SyckNode *`
`86`		`-syck_alloc_str()`
	`86`	`+syck_alloc_str(void)`
`87`	`87`	`{`
`88`	`88`	`SyckNode *n;`
`89`	`89`	`struct SyckStr *s;`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ syck_parser_set_root_on_error( SyckParser *p, SYMID roer )`
`155`	`155`	`* Allocate the parser`
`156`	`156`	`*/`
`157`	`157`	`SyckParser *`
`158`		`-syck_new_parser()`
	`158`	`+syck_new_parser(void)`
`159`	`159`	`{`
`160`	`160`	`SyckParser *p;`
`161`	`161`	`p = S_ALLOC( SyckParser );`