glib2 0.90.7 → 0.90.8

data/ext/glib2/rbglib_mainloop.c

@@ -45,31 +45,27 @@ ml_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ml_run(self)
-    VALUE self;
+ml_run(VALUE self)
 {
     g_main_loop_run(_SELF(self));
     return self;
 }
 
 static VALUE
-ml_quit(self)
-    VALUE self;
+ml_quit(VALUE self)
 {
     g_main_loop_quit(_SELF(self));
     return Qnil;
 }
 
 static VALUE
-ml_is_running(self)
-    VALUE self;
+ml_is_running(VALUE self)
 {
     return CBOOL2RVAL(g_main_loop_is_running(_SELF(self)));
 }
 
 static VALUE
-ml_get_context(self)
-    VALUE self;
+ml_get_context(VALUE self)
 {
     return BOXED2RVAL(g_main_loop_get_context(_SELF(self)), G_TYPE_MAIN_CONTEXT);
 }

data/ext/glib2/rbglib_messages.c

@@ -48,11 +48,7 @@ static gchar* logmessage(GLogLevelFlags level)
 }
 
 static void
-rbglib_log_handler(log_domain, log_level, message, user_data)
-    const gchar *log_domain;
-    GLogLevelFlags log_level;
-    const gchar *message;
-    gpointer user_data;
+rbglib_log_handler(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data)
 {
     if (! log_canceled){
 #ifdef HAVE_RUBY_SET_CURRENT_SOURCE
@@ -67,16 +63,14 @@ rbglib_log_handler(log_domain, log_level, message, user_data)
 
 /* Use Internal only */
 static VALUE
-rbglib_m_log_cancel_handler(self)
-    VALUE self;
+rbglib_m_log_cancel_handler(VALUE self)
 {
     log_canceled = TRUE;
     return Qnil;
 }
 
 static VALUE
-rbglib_m_log_set_handler(self, domain, levels)
-    VALUE self, domain, levels;
+rbglib_m_log_set_handler(VALUE self, VALUE domain, VALUE levels)
 {
     guint handler_id = g_log_set_handler(NIL_P(domain) ? NULL : RVAL2CSTR(domain),
                                          NUM2INT(levels),
@@ -85,8 +79,7 @@ rbglib_m_log_set_handler(self, domain, levels)
 }
 
 static VALUE
-rbglib_m_log_remove_handler(self, domain, handler_id)
-    VALUE self, domain, handler_id;
+rbglib_m_log_remove_handler(VALUE self, VALUE domain, VALUE handler_id)
 {
     g_log_remove_handler(NIL_P(domain) ? NULL : RVAL2CSTR(domain),
                          NUM2UINT(handler_id));
@@ -95,23 +88,20 @@ rbglib_m_log_remove_handler(self, domain, handler_id)
 }
 
 static VALUE
-rbglib_m_log_set_always_fatal(self, fatal_mask)
-    VALUE self, fatal_mask;
+rbglib_m_log_set_always_fatal(VALUE self, VALUE fatal_mask)
 {
     return INT2NUM(g_log_set_always_fatal(NUM2INT(fatal_mask)));
 }
 
 static VALUE
-rbglib_m_log_set_fatal_mask(self, domain, fatal_mask)
-    VALUE self, domain, fatal_mask;
+rbglib_m_log_set_fatal_mask(VALUE self, VALUE domain, VALUE fatal_mask)
 {
     return INT2NUM(g_log_set_fatal_mask(NIL_P(domain) ? NULL : RVAL2CSTR(domain),
                                         NUM2INT(fatal_mask)));
 }
 
 static VALUE
-rbglib_m_log(self, domain, level, str)
-    VALUE self, domain, level, str;
+rbglib_m_log(VALUE self, VALUE domain, VALUE level, VALUE str)
 {
     g_log(NIL_P(domain) ? NULL : RVAL2CSTR(domain), NUM2INT(level), RVAL2CSTR(str), NULL);
     return Qnil;

data/ext/glib2/rbglib_pollfd.c

@@ -38,8 +38,7 @@ g_poll_fd_get_type(void)
 #define _SELF(s) ((GPollFD*)RVAL2BOXED(s, G_TYPE_POLL_FD))
 
 static VALUE
-poll_initialize(self, fd, events, revents)
-    VALUE self, fd, events, revents;
+poll_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
 {
     GPollFD gfd;
     gfd.fd = NUM2INT(fd);
@@ -51,43 +50,37 @@ poll_initialize(self, fd, events, revents)
 }
 
 static VALUE
-poll_set_fd(self, fd)
-    VALUE self, fd;
+poll_set_fd(VALUE self, VALUE fd)
 {
     _SELF(self)->fd = fd;
     return self;
 }
 static VALUE
-poll_fd(self)
-    VALUE self;
+poll_fd(VALUE self)
 {
     return INT2NUM(_SELF(self)->fd);
 }
 
 static VALUE
-poll_set_events(self, events)
-    VALUE self, events;
+poll_set_events(VALUE self, VALUE events)
 {
     _SELF(self)->events = events;
     return self;
 }
 static VALUE
-poll_events(self)
-    VALUE self;
+poll_events(VALUE self)
 {
     return INT2NUM(_SELF(self)->events);
 }
 
 static VALUE
-poll_set_revents(self, revents)
-    VALUE self, revents;
+poll_set_revents(VALUE self, VALUE revents)
 {
     _SELF(self)->revents = revents;
     return self;
 }
 static VALUE
-poll_revents(self)
-    VALUE self;
+poll_revents(VALUE self)
 {
     return INT2NUM(_SELF(self)->revents);
 }

data/ext/glib2/rbglib_shell.c

@@ -12,8 +12,7 @@
 #include "rbgprivate.h"
 
 static VALUE
-shell_parse(self, command_line)
-    VALUE self, command_line;
+shell_parse(VALUE self, VALUE command_line)
 {
     gint argc, i;
     gchar** argv;
@@ -34,15 +33,13 @@ shell_parse(self, command_line)
 }
 
 static VALUE
-shell_quote(self, unquoted_string)
-    VALUE self, unquoted_string;
+shell_quote(VALUE self, VALUE unquoted_string)
 {
     return CSTR2RVAL_FREE(g_shell_quote((const gchar*)RVAL2CSTR(unquoted_string)));
 }
 
 static VALUE
-shell_unquote(self, quoted_string)
-    VALUE self, quoted_string;
+shell_unquote(VALUE self, VALUE quoted_string)
 {
     GError* err = NULL;
     gchar* str = g_shell_unquote((const gchar*)RVAL2CSTR(quoted_string), &err);

data/ext/glib2/rbglib_source.c

@@ -15,8 +15,7 @@ static ID id_call;
 
 /*****************************************/
 static void
-source_free(source)
-    GSource* source;
+source_free(GSource *source)
 {
     g_source_unref(source);
     g_source_destroy(source);
@@ -42,8 +41,7 @@ GSource*    g_source_new                    (GSourceFuncs *source_funcs,
 */
 
 static VALUE
-source_attach(self, context)
-    VALUE self, context;
+source_attach(VALUE self, VALUE context)
 {
     return UINT2NUM(g_source_attach(_SELF(self), 
                                     RVAL2BOXED(context, G_TYPE_MAIN_CONTEXT)));
@@ -51,68 +49,59 @@ source_attach(self, context)
 
 #if GLIB_CHECK_VERSION(2,12,0)
 static VALUE
-source_is_destroyed(self)
-    VALUE self;
+source_is_destroyed(VALUE self)
 {
     return CBOOL2RVAL(g_source_is_destroyed(_SELF(self)));
 }
 #endif
 
 static VALUE
-source_set_priority(self, priority)
-    VALUE self, priority;
+source_set_priority(VALUE self, VALUE priority)
 {
     g_source_set_priority(_SELF(self), NUM2INT(priority));
     return self;
 }
 
 static VALUE
-source_get_priority(self)
-    VALUE self;
+source_get_priority(VALUE self)
 {
     return INT2NUM(g_source_get_priority(_SELF(self)));
 }
 
 static VALUE
-source_set_can_recurse(self, can_recurse)
-    VALUE self, can_recurse;
+source_set_can_recurse(VALUE self, VALUE can_recurse)
 {
     g_source_set_can_recurse(_SELF(self), RVAL2CBOOL(can_recurse));
     return self;
 }
 
 static VALUE
-source_get_can_recurse(self)
-    VALUE self;
+source_get_can_recurse(VALUE self)
 {
     return CBOOL2RVAL(g_source_get_can_recurse(_SELF(self)));
 }
 
 static VALUE
-source_get_id(self)
-    VALUE self;
+source_get_id(VALUE self)
 {
     return UINT2NUM(g_source_get_id(_SELF(self)));
 }
 
 static VALUE
-source_get_context(self)
-    VALUE self;
+source_get_context(VALUE self)
 {
     GMainContext* context = g_source_get_context(_SELF(self));
     return BOXED2RVAL(context, G_TYPE_MAIN_CONTEXT);
 }
 
 static gboolean
-source_func(func)
-    gpointer func;
+source_func(gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 0));
 }
 
 static VALUE
-source_set_callback(self)
-    VALUE self;
+source_set_callback(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -130,24 +119,21 @@ void        g_source_set_callback_indirect  (GSource *source,
 */
 
 static VALUE
-source_add_poll(self, fd)
-    VALUE self, fd;
+source_add_poll(VALUE self, VALUE fd)
 {
     g_source_add_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD));
     return self;
 }
 
 static VALUE
-source_remove_poll(self, fd)
-    VALUE self, fd;
+source_remove_poll(VALUE self, VALUE fd)
 {
     g_source_remove_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD));
     return self;
 }
 
 static VALUE
-source_get_current_time(self)
-    VALUE self;
+source_get_current_time(VALUE self)
 {
     GTimeVal timeval;
     g_source_get_current_time(_SELF(self), &timeval);

data/ext/glib2/rbglib_spawn.c

@@ -17,8 +17,7 @@ static ID id_call;
 static ID id_new;
 
 static void
-child_setup(func)
-    gpointer func;
+child_setup(gpointer func)
 {
     if (! NIL_P(func)){
         rb_funcall((VALUE)func, id_call, 0);
@@ -26,8 +25,7 @@ child_setup(func)
 }
 
 static VALUE
-rbglib_m_spawn_async_with_pipes(self, working_directory, argv, envp, flags)
-    VALUE self, working_directory, argv, envp, flags;
+rbglib_m_spawn_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
 {
     GError *err = NULL;
     gboolean ret;
@@ -90,8 +88,7 @@ rbglib_m_spawn_async_with_pipes(self, working_directory, argv, envp, flags)
 }
 
 static VALUE
-rbglib_m_spawn_async(self, working_directory, argv, envp, flags)
-    VALUE self, working_directory, argv, envp, flags;
+rbglib_m_spawn_async(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
 {
     GError *err = NULL;
     gboolean ret;
@@ -149,8 +146,7 @@ rbglib_m_spawn_async(self, working_directory, argv, envp, flags)
 }
 
 static VALUE
-rbglib_m_spawn_sync(self, working_directory, argv, envp, flags)
-    VALUE self, working_directory, argv, envp, flags;
+rbglib_m_spawn_sync(VALUE self, VALUE working_directory, VALUE argv, VALUE envp, VALUE flags)
 {
     GError *err = NULL;
     gboolean ret;
@@ -231,8 +227,7 @@ rbglib_m_spawn_sync(self, working_directory, argv, envp, flags)
 }
 
 static VALUE
-rbglib_m_spawn_command_line_sync(self, str)
-    VALUE self, str;
+rbglib_m_spawn_command_line_sync(VALUE self, VALUE str)
 {
     GError *err = NULL;
     const gchar *command_line;
@@ -269,8 +264,7 @@ rbglib_m_spawn_command_line_sync(self, str)
 }
 
 static VALUE
-rbglib_m_spawn_command_line_async(self, str)
-    VALUE self, str;
+rbglib_m_spawn_command_line_async(VALUE self, VALUE str)
 {
     GError *err = NULL;
     const gchar *command_line;
@@ -286,8 +280,7 @@ rbglib_m_spawn_command_line_async(self, str)
 
 #ifdef HAVE_G_SPAWN_CLOSE_PID
 static VALUE
-rbglib_m_spawn_close_pid(self, pid)
-    VALUE self, pid;
+rbglib_m_spawn_close_pid(VALUE self, VALUE pid)
 {
     g_spawn_close_pid(NUM2INT(pid));
     return Qnil;

data/ext/glib2/rbglib_threads.c

@@ -14,8 +14,7 @@
 static VALUE gthreads;
 
 static VALUE
-gt_init(self)
-    VALUE self;
+gt_init(VALUE self)
 {
 #ifdef HAVE_G_THREAD_INIT
 #ifdef G_THREADS_ENABLED
@@ -26,8 +25,7 @@ gt_init(self)
 }
 
 static VALUE
-gt_supported(self)
-    VALUE self;
+gt_supported(VALUE self)
 {
 #ifdef HAVE_G_THREAD_INIT
 #ifdef G_THREADS_ENABLED

data/ext/glib2/rbglib_timer.c

@@ -32,8 +32,7 @@ struct _GTimer
 };
 
 static GTimer*
-timer_copy(timer)
-    GTimer* timer;
+timer_copy(GTimer *timer)
 {
   GTimer* new_timer;
   g_return_val_if_fail (timer != NULL, NULL);
@@ -60,24 +59,21 @@ g_timer_get_type(void)
 #define _SELF(s) ((GTimer*)RVAL2BOXED(s, G_TYPE_TIMER))
 
 static VALUE
-timer_initialize(self)
-    VALUE self;
+timer_initialize(VALUE self)
 {
     G_INITIALIZE(self, g_timer_new());
     return Qnil;
 }
 
 static VALUE
-timer_start(self)
-    VALUE self;
+timer_start(VALUE self)
 {
     g_timer_start(_SELF(self));
     return self;
 }
 
 static VALUE
-timer_stop(self)
-    VALUE self;
+timer_stop(VALUE self)
 {
     g_timer_stop(_SELF(self));
     return self;
@@ -85,8 +81,7 @@ timer_stop(self)
 
 #if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
-timer_continue(self)
-    VALUE self;
+timer_continue(VALUE self)
 {
     g_timer_continue(_SELF(self));
     return self;
@@ -94,8 +89,7 @@ timer_continue(self)
 #endif
 
 static VALUE
-timer_elapsed(self)
-    VALUE self;
+timer_elapsed(VALUE self)
 {
     gulong microseconds;
     gdouble ret = g_timer_elapsed(_SELF(self), &microseconds);
@@ -104,8 +98,7 @@ timer_elapsed(self)
 }
 
 static VALUE
-timer_reset(self)
-    VALUE self;
+timer_reset(VALUE self)
 {
     g_timer_reset(_SELF(self));
     return self;