From: Stefan Huehner <stefan@...>
Date: 2007-03-11T09:17:18+09:00
Subject: [patch] code-cleanup: kr -> ansi


--2qXFWqzzG3v1+95a
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

attached patch modifies some function from using k&r style function
declarations to using ansi c, and from using () to (void).

Regards,
Stefan


--2qXFWqzzG3v1+95a
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="ruby_kr1.diff"

Index: regparse.c
===================================================================
--- regparse.c	(revision 12023)
+++ regparse.c	(working copy)
@@ -1088,7 +1088,7 @@
 
 #ifdef USE_RECYCLE_NODE
 extern int
-onig_free_node_list()
+onig_free_node_list(void)
 {
   FreeNode* n;
 
@@ -1104,7 +1104,7 @@
 #endif
 
 static Node*
-node_new()
+node_new(void)
 {
   Node* node;
 
@@ -1133,7 +1133,7 @@
 }
 
 static Node*
-node_new_cclass()
+node_new_cclass(void)
 {
   Node* node = node_new();
   CHECK_NULL_RETURN(node);
@@ -1202,7 +1202,7 @@
 }
 
 static Node*
-node_new_anychar()
+node_new_anychar(void)
 {
   Node* node = node_new();
   CHECK_NULL_RETURN(node);
@@ -1490,7 +1490,7 @@
 }
 
 static Node*
-node_new_empty()
+node_new_empty(void)
 {
   return node_new_str(NULL, NULL);
 }
@@ -4826,7 +4826,7 @@
 }
 
 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);
Index: regparse.h
===================================================================
--- regparse.h	(revision 12023)
+++ regparse.h	(working copy)
@@ -315,7 +315,7 @@
 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));
 
Index: debug.h
===================================================================
--- debug.h	(revision 12023)
+++ debug.h	(working copy)
@@ -24,7 +24,7 @@
 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
 
Index: regcomp.c
===================================================================
--- regcomp.c	(revision 12023)
+++ regcomp.c	(working copy)
@@ -34,7 +34,7 @@
    ONIGENC_AMBIGUOUS_MATCH_NONASCII_CASE);
 
 extern OnigAmbigType
-onig_get_default_ambig_flag()
+onig_get_default_ambig_flag(void)
 {
   return OnigDefaultAmbigFlag;
 }
@@ -5402,9 +5402,9 @@
 
 
 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;
 
Index: regenc.c
===================================================================
--- regenc.c	(revision 12023)
+++ regenc.c	(working copy)
@@ -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;
 }
Index: thread.c
===================================================================
--- thread.c	(revision 12023)
+++ thread.c	(working copy)
@@ -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 @@
 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 @@
 }
 
 void
-rb_thread_schedule()
+rb_thread_schedule(void)
 {
     thread_debug("rb_thread_schedule\n");
     if (!rb_thread_alone()) {
@@ -722,7 +721,7 @@
 
 
 void
-rb_gc_mark_threads()
+rb_gc_mark_threads(void)
 {
     /* TODO: remove */
 }
@@ -905,7 +904,7 @@
  */
 
 static VALUE
-rb_thread_exit()
+rb_thread_exit(void)
 {
     return rb_thread_kill(GET_THREAD()->self);
 }
@@ -1094,7 +1093,7 @@
  */
 
 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 @@
  */
 
 VALUE
-thgroup_enclose(group)
-    VALUE group;
+thgroup_enclose(VALUE group)
 {
     struct thgroup *data;
 
@@ -2501,7 +2499,7 @@
 }
 
 VALUE
-is_ruby_native_thread()
+is_ruby_native_thread(void)
 {
     return Qtrue;
 }
Index: oniguruma.h
===================================================================
--- oniguruma.h	(revision 12023)
+++ oniguruma.h	(working copy)
@@ -425,11 +425,11 @@
 
 /* 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 @@
 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
Index: yarvcore.h
===================================================================
--- yarvcore.h	(revision 12023)
+++ yarvcore.h	(working copy)
@@ -539,7 +539,7 @@
 #define ic_vmstat u3.cnt
 typedef NODE *IC;
 
-void rb_vm_change_state();
+void rb_vm_change_state(void);
 
 typedef VALUE CDHASH;
 
Index: util.c
===================================================================
--- util.c	(revision 12023)
+++ util.c	(working copy)
@@ -393,9 +393,7 @@
 
 #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 @@
 }
 #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) {
Index: ext/curses/curses.c
===================================================================
--- ext/curses/curses.c	(revision 12023)
+++ ext/curses/curses.c	(working copy)
@@ -72,9 +72,9 @@
 
 #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)
Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 12023)
+++ ext/socket/socket.c	(working copy)
@@ -750,7 +750,7 @@
 }
 
 static VALUE
-bsock_do_not_rev_lookup()
+bsock_do_not_rev_lookup(void)
 {
     return do_not_reverse_lookup?Qtrue:Qfalse;
 }
Index: ext/syck/rubyext.c
===================================================================
--- ext/syck/rubyext.c	(revision 12023)
+++ ext/syck/rubyext.c	(working copy)
@@ -60,10 +60,10 @@
 /*
  * 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 );
 
Index: ext/syck/syck.c
===================================================================
--- ext/syck/syck.c	(revision 12023)
+++ ext/syck/syck.c	(working copy)
@@ -155,7 +155,7 @@
  * Allocate the parser
  */
 SyckParser *
-syck_new_parser()
+syck_new_parser(void)
 {
     SyckParser *p;
     p = S_ALLOC( SyckParser );
Index: ext/syck/syck.h
===================================================================
--- ext/syck/syck.h	(revision 12023)
+++ ext/syck/syck.h	(working copy)
@@ -390,7 +390,7 @@
 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 @@
 /*
  * 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 );
Index: ext/syck/node.c
===================================================================
--- ext/syck/node.c	(revision 12023)
+++ ext/syck/node.c	(working copy)
@@ -46,7 +46,7 @@
 }
 
 SyckNode *
-syck_alloc_map()
+syck_alloc_map(void)
 {
     SyckNode *n;
     struct SyckMap *m;
@@ -65,7 +65,7 @@
 }
 
 SyckNode *
-syck_alloc_seq()
+syck_alloc_seq(void)
 {
     SyckNode *n;
     struct SyckSeq *s;
@@ -83,7 +83,7 @@
 }
 
 SyckNode *
-syck_alloc_str()
+syck_alloc_str(void)
 {
     SyckNode *n;
     struct SyckStr *s;
Index: ext/etc/etc.c
===================================================================
--- ext/etc/etc.c	(revision 12023)
+++ ext/etc/etc.c	(working copy)
@@ -164,14 +164,14 @@
 #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 @@
 #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;
 
Index: error.c
===================================================================
--- error.c	(revision 12023)
+++ error.c	(working copy)
@@ -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 @@
     return Qnil;
 }
 
-void yarv_bug();
+void yarv_bug(void);
 
 void
 rb_bug(const char *fmt, ...)
Index: vm.c
===================================================================
--- vm.c	(revision 12023)
+++ vm.c	(working copy)
@@ -843,7 +843,7 @@
 }
 
 static struct RValues *
-new_value()
+new_value(void)
 {
     struct RValues *val = RVALUES(rb_newobj());
     OBJSETUP(val, 0, T_VALUES);
Index: vm_dump.c
===================================================================
--- vm_dump.c	(revision 12023)
+++ vm_dump.c	(working copy)
@@ -576,7 +576,7 @@
 }
 
 void
-yarv_bug()
+yarv_bug(void)
 {
     rb_thread_t *th = GET_THREAD();
     VALUE bt;
Index: ruby.h
===================================================================
--- ruby.h	(revision 12023)
+++ ruby.h	(working copy)
@@ -291,7 +291,7 @@
 #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);

--2qXFWqzzG3v1+95a--