glib2 0.90.7 → 0.90.8

data/ext/glib2/rbglib_completion.c

@@ -19,8 +19,7 @@ static ID id_items_internal;
 
 /*****************************************/
 static GCompletion*
-completion_copy(comp)
-    GCompletion* comp;
+completion_copy(GCompletion *comp)
 {
   GCompletion* new_comp;
   g_return_val_if_fail (comp != NULL, NULL);
@@ -48,8 +47,7 @@ g_completion_get_type(void)
 
 /* data should be [self, data] */
 static gchar*
-comp_func(compdata)
-    gpointer compdata;
+comp_func(gpointer compdata)
 {
     VALUE ret;
     VALUE self = RARRAY_PTR((VALUE)compdata)[0];
@@ -66,8 +64,7 @@ comp_func(compdata)
 }
 
 static VALUE
-comp_initialize(self)
-    VALUE self;
+comp_initialize(VALUE self)
 {
     VALUE block = Qnil;
 
@@ -85,8 +82,7 @@ comp_initialize(self)
 }
 
 static VALUE
-comp_add_items(self, items)
-    VALUE self, items;
+comp_add_items(VALUE self, VALUE items)
 {
     gint i, len;
     GList* list = (GList*)NULL;
@@ -106,8 +102,7 @@ comp_add_items(self, items)
 }
 
 static VALUE
-comp_remove_items(self, items)
-    VALUE self, items;
+comp_remove_items(VALUE self, VALUE items)
 {
     gint i, len;
     GList* list = (GList*)NULL;
@@ -127,8 +122,7 @@ comp_remove_items(self, items)
 }
 
 static VALUE
-comp_clear_items(self)
-    VALUE self;
+comp_clear_items(VALUE self)
 {
     VALUE items_internal = rb_ivar_get(self, id_items_internal);
     rb_funcall(items_internal, id_clear, 0);
@@ -137,15 +131,13 @@ comp_clear_items(self)
 }
 
 static VALUE
-comp_items(self)
-    VALUE self;
+comp_items(VALUE self)
 {
     return rb_ivar_get(self, id_items_internal);
 }
 
 static VALUE
-comp_complete(self, prefix)
-    VALUE self, prefix;
+comp_complete(VALUE self, VALUE prefix)
 {
     gchar* new_prefix;
     VALUE ary = rb_ary_new();

data/ext/glib2/rbglib_convert.c

@@ -14,8 +14,7 @@
 #include "rbglib.h"
 
 static VALUE
-rbglib_m_convert(self, str, to, from)
-    VALUE self, str, to, from;
+rbglib_m_convert(VALUE self, VALUE str, VALUE to, VALUE from)
 {
     GError *err = NULL;
     gchar* ret;
@@ -35,8 +34,7 @@ rbglib_m_convert(self, str, to, from)
 }
 
 static VALUE
-rbglib_m_locale_to_utf8(self, str)
-    VALUE self, str;
+rbglib_m_locale_to_utf8(VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -55,8 +53,7 @@ rbglib_m_locale_to_utf8(self, str)
 }
 
 static VALUE
-rbglib_m_locale_from_utf8(self, str)
-    VALUE self, str;
+rbglib_m_locale_from_utf8(VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -75,8 +72,7 @@ rbglib_m_locale_from_utf8(self, str)
 }
 
 static VALUE
-rbglib_m_filename_to_utf8(self, str)
-    VALUE self, str;
+rbglib_m_filename_to_utf8(VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -95,8 +91,7 @@ rbglib_m_filename_to_utf8(self, str)
 }
 
 static VALUE
-rbglib_m_filename_from_utf8(self, str)
-    VALUE self, str;
+rbglib_m_filename_from_utf8(VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s = Qnil;
@@ -115,10 +110,7 @@ rbglib_m_filename_from_utf8(self, str)
 }
 
 static VALUE
-rbglib_m_filename_to_uri(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rbglib_m_filename_to_uri(int argc, VALUE *argv, VALUE self)
 {
     VALUE filename, hostname, s;
     GError *err = NULL;
@@ -138,8 +130,7 @@ rbglib_m_filename_to_uri(argc, argv, self)
 }
 
 static VALUE
-rbglib_m_filename_from_uri(self, str)
-    VALUE self, str;
+rbglib_m_filename_from_uri(VALUE self, VALUE str)
 {
     GError *err = NULL;
     VALUE s;
@@ -158,8 +149,7 @@ rbglib_m_filename_from_uri(self, str)
 }
 
 static VALUE
-rbglib_m_utf8_validate(self, str)
-    VALUE self, str;
+rbglib_m_utf8_validate(VALUE self, VALUE str)
 {
     rb_warning("GLib.utf8_validate is deprecated. Use GLib::UTF8.validate instead.");
     StringValue(str);

data/ext/glib2/rbglib_error.c

@@ -18,8 +18,7 @@ static VALUE gerror_table;
 static VALUE generic_error;
 
 VALUE
-rbgerr_gerror2exception(error)
-    GError *error;
+rbgerr_gerror2exception(GError *error)
 {
     VALUE exc = Qnil;
     VALUE klass = Qnil;
@@ -43,12 +42,7 @@ rbgerr_gerror2exception(error)
 }
 
 VALUE
-rbgerr_define_gerror(domain, name, module, parent, gtype)
-    GQuark domain;
-    const gchar* name;
-    VALUE module;
-    VALUE parent;
-    VALUE gtype;
+rbgerr_define_gerror(GQuark domain, const gchar *name, VALUE module, VALUE parent, VALUE gtype)
 {
     VALUE klass = rb_define_class_under(module, name, parent);
     rb_funcall(klass, rbgutil_id_module_eval, 1, CSTR2RVAL("def code; @code; end\n"));

data/ext/glib2/rbglib_i18n.c

@@ -17,8 +17,7 @@
 
 #if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
-rbglib_m_language_names(self)
-    VALUE self;
+rbglib_m_language_names(VALUE self)
 {
     const gchar * const *languages;
     const gchar *language;

data/ext/glib2/rbglib_iochannel.c

@@ -16,9 +16,7 @@ static ID id_call;
 #define _SELF(s) ((GIOChannel*)RVAL2BOXED(s, G_TYPE_IO_CHANNEL))
 
 static void
-ioc_error(status, err)
-    GIOStatus status;
-    GError* err;
+ioc_error(GIOStatus status, GError *err)
 {
     if (err != NULL) RAISE_GERROR(err);
 
@@ -34,10 +32,7 @@ ioc_error(status, err)
 }
 
 static VALUE
-ioc_initialize(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_initialize(gint argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
 
@@ -69,8 +64,7 @@ ioc_initialize(argc, argv, self)
 }
 
 static VALUE
-ioc_close(self)
-    VALUE self;
+ioc_close(VALUE self)
 {
     GError* err = NULL;
     GIOStatus status = g_io_channel_shutdown(_SELF(self), TRUE, &err);
@@ -80,10 +74,7 @@ ioc_close(self)
 }
 
 static VALUE
-ioc_s_open(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_s_open(gint argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     VALUE rio;
@@ -114,8 +105,7 @@ ioc_s_open(argc, argv, self)
 }
 
 static VALUE
-ioc_get_fd(self)
-    VALUE self;
+ioc_get_fd(VALUE self)
 {
 #ifdef G_OS_UNIX
     return INT2NUM(g_io_channel_unix_get_fd(_SELF(self)));
@@ -131,50 +121,56 @@ void        g_io_channel_init               (GIOChannel *channel);
 
 
 static VALUE
-ioc_read_chars(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_read_chars(gint argc, VALUE *argv, VALUE self)
 {
     VALUE count, ret;
     gchar* buf;
     gsize bytes_read;
     GError* err = NULL;
     GIOStatus status;
+    GIOChannel *channel;
 
     rb_scan_args(argc, argv, "01", &count);
 
-    if (NIL_P(count)){
+    channel = _SELF(self);
+    if (NIL_P(count)) {
         gsize length;
-        status = g_io_channel_read_to_end(_SELF(self), &buf,
-                                          &length, &err);
 
-        if (status == G_IO_STATUS_EOF){
+        status = g_io_channel_read_to_end(channel, &buf, &length, &err);
+
+        if (status == G_IO_STATUS_EOF) {
             ret = CSTR2RVAL("");
         } else {
             ioc_error(status, err);
         }
-        ret = buf ? rb_str_new(buf, length) : CSTR2RVAL("");
-        g_free(buf);
+        if (buf) {
+            ret = CSTR2RVAL_LEN(buf, length);
+            g_free(buf);
+        } else {
+            ret = CSTR2RVAL("");
+        }
     } else {
         buf = ALLOCA_N(gchar, count);
         memset(buf, '\0', count);
-        
-        status = g_io_channel_read_chars(_SELF(self), buf, NUM2UINT(count),
+
+        status = g_io_channel_read_chars(channel, buf, NUM2UINT(count),
                                          &bytes_read, &err);
-        if (status == G_IO_STATUS_EOF){
+        if (status == G_IO_STATUS_EOF) {
             ret = CSTR2RVAL("");
         } else {
             ioc_error(status, err);
         }
-        ret = buf ? CSTR2RVAL(buf) : CSTR2RVAL("");
+        if (buf) {
+            ret = CSTR2RVAL_LEN(buf, bytes_read);
+        } else {
+            ret = CSTR2RVAL("");
+        }
     }
     return ret;
 }
 
 static VALUE
-ioc_read_unichar(self)
-    VALUE self;
+ioc_read_unichar(VALUE self)
 {
     gunichar thechar;
     GError* err = NULL;
@@ -186,8 +182,7 @@ ioc_read_unichar(self)
 }
 
 static VALUE
-ioc_getuc(self)
-    VALUE self;
+ioc_getuc(VALUE self)
 {
     gunichar thechar;
     GError* err = NULL;
@@ -205,8 +200,7 @@ ioc_getuc(self)
 }
 
 static VALUE
-ioc_each_char(self)
-    VALUE self;
+ioc_each_char(VALUE self)
 {
     if (!rb_block_given_p()) {
         rb_raise(rb_eArgError, "called without a block");
@@ -227,10 +221,7 @@ ioc_each_char(self)
 }
 
 static VALUE
-ioc_read_line(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_read_line(gint argc, VALUE *argv, VALUE self)
 {
     gchar* str;
     VALUE line_term, ret;
@@ -265,10 +256,7 @@ ioc_read_line(argc, argv, self)
 }
 
 static VALUE
-ioc_gets(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_gets(gint argc, VALUE *argv, VALUE self)
 {
     gchar* str;
     VALUE line_term, ret;
@@ -307,8 +295,7 @@ ioc_gets(argc, argv, self)
 
 /* Internal use only */
 static VALUE
-ioc_set_line_term(args)
-    VALUE args;
+ioc_set_line_term(VALUE args)
 {
     VALUE self = RARRAY_PTR(args)[0];
     VALUE doit = RARRAY_PTR(args)[1];
@@ -323,16 +310,13 @@ ioc_set_line_term(args)
 }
 
 static VALUE
-ioc_each_line(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_each_line(gint argc, VALUE *argv, VALUE self)
 {
     gchar* str;
     VALUE line_term;
     GIOStatus status;
     GError* err = NULL;
-
+    GIOChannel *channel;
     const gchar* old_line_term = NULL;
     gint old_line_term_len;
 
@@ -342,27 +326,32 @@ ioc_each_line(argc, argv, self)
 
     rb_scan_args(argc, argv, "01", &line_term);
 
-    if (! NIL_P(line_term)){
+    channel = _SELF(self);
+    if (!NIL_P(line_term)) {
         StringValue(line_term);
 
-        old_line_term = g_io_channel_get_line_term(_SELF(self), &old_line_term_len);
-        g_io_channel_set_line_term(_SELF(self), RVAL2CSTR(line_term),
+        old_line_term = g_io_channel_get_line_term(channel, &old_line_term_len);
+        g_io_channel_set_line_term(channel, RVAL2CSTR(line_term),
                                    RSTRING_LEN(line_term));
     }
 
-    while (TRUE){
-        status = g_io_channel_read_line(_SELF(self), &str, NULL, NULL, &err);
-        if (status == G_IO_STATUS_EOF){
+    while (TRUE) {
+        status = g_io_channel_read_line(channel, &str, NULL, NULL, &err);
+        if (status == G_IO_STATUS_EOF) {
             break;
         } else {
             VALUE rstr;
             ioc_error(status, err);
-            rstr = str ? CSTR2RVAL(str) : CSTR2RVAL("");
+            if (str) {
+                rstr = CSTR2RVAL(str);
+            } else {
+                rstr = CSTR2RVAL("");
+            }
             g_free(str);
-            rb_ensure(rb_yield, rstr, ioc_set_line_term, 
-                      rb_ary_new3(3, self, 
+            rb_ensure(rb_yield, rstr, ioc_set_line_term,
+                      rb_ary_new3(3, self,
                                   NIL_P(line_term) ? Qfalse :  Qtrue,
-                                  old_line_term ? rb_str_new(old_line_term, old_line_term_len) : Qnil));
+                                  CSTR2RVAL(old_line_term)));
         }
     }
     return self;
@@ -378,8 +367,7 @@ GIOStatus   g_io_channel_read_line_string   (GIOChannel *channel,
 
 /* Use GLib::IOChannel#read instead.
 static VALUE
-ioc_read_to_end(self)
-    VALUE self;
+ioc_read_to_end(VALUE self)
 {
     gchar* str;
     gsize length;
@@ -399,8 +387,7 @@ ioc_read_to_end(self)
 */
 
 static VALUE
-ioc_write_chars(self, buf)
-    VALUE self, buf;
+ioc_write_chars(VALUE self, VALUE buf)
 {
     gssize count;
     gsize bytes_written;
@@ -423,8 +410,7 @@ ioc_write_chars(self, buf)
 static ID id_unpack;
 
 static VALUE
-ioc_write_unichar(self, thechar)
-    VALUE self, thechar;
+ioc_write_unichar(VALUE self, VALUE thechar)
 {
     GError* err = NULL;
     GIOStatus status;
@@ -446,8 +432,7 @@ ioc_write_unichar(self, thechar)
 }
 
 static VALUE
-ioc_flush(self)
-    VALUE self;
+ioc_flush(VALUE self)
 {
     GError* err = NULL;
     GIOStatus status =  g_io_channel_flush(_SELF(self), &err);
@@ -456,10 +441,7 @@ ioc_flush(self)
 }
 
 static VALUE
-ioc_seek(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_seek(gint argc, VALUE *argv, VALUE self)
 {
     VALUE ofs, type;
     GIOStatus status;
@@ -478,8 +460,7 @@ ioc_seek(argc, argv, self)
 }
 
 static VALUE
-ioc_seek_pos(self, pos)
-    VALUE self, pos;
+ioc_seek_pos(VALUE self, VALUE pos)
 {
     GError* err = NULL;
     GIOStatus status = g_io_channel_seek_position(_SELF(self), NUM2INT(pos),
@@ -489,10 +470,7 @@ ioc_seek_pos(self, pos)
 }
 
 static VALUE
-ioc_shutdown(argc, argv, self)
-    gint argc;
-    VALUE* argv;
-    VALUE self;
+ioc_shutdown(gint argc, VALUE *argv, VALUE self)
 {
     VALUE flush;
     GError* err = NULL;
@@ -512,18 +490,14 @@ ioc_shutdown(argc, argv, self)
 }
 
 static VALUE
-ioc_create_watch(self, condition)
-    VALUE self, condition;
+ioc_create_watch(VALUE self, VALUE condition)
 {
     return BOXED2RVAL(g_io_create_watch(_SELF(self), NUM2INT(condition)), 
                       G_TYPE_SOURCE);
 }
 
 static gboolean
-io_func(source, condition, func)
-    GIOChannel* source;
-    GIOCondition condition;
-    gpointer func;
+io_func(GIOChannel *source, GIOCondition condition, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 2, 
                             BOXED2RVAL(source, G_TYPE_IO_CHANNEL), 
@@ -531,8 +505,7 @@ io_func(source, condition, func)
 }
 
 static VALUE
-ioc_add_watch(self, condition)
-    VALUE self, condition;
+ioc_add_watch(VALUE self, VALUE condition)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -550,37 +523,32 @@ guint       g_io_add_watch_full             (GIOChannel *channel,
 */
 
 static VALUE
-ioc_get_buffer_size(self)
-    VALUE self;
+ioc_get_buffer_size(VALUE self)
 {
     return UINT2NUM(g_io_channel_get_buffer_size(_SELF(self)));
 }
 
 static VALUE
-ioc_set_buffer_size(self, buffer_size)
-    VALUE self, buffer_size;
+ioc_set_buffer_size(VALUE self, VALUE buffer_size)
 {
     g_io_channel_set_buffer_size(_SELF(self), NUM2UINT(buffer_size));
     return self;
 }
 
 static VALUE
-ioc_get_buffer_condition(self)
-    VALUE self;
+ioc_get_buffer_condition(VALUE self)
 {
     return INT2NUM(g_io_channel_get_buffer_condition(_SELF(self)));
 }
 
 static VALUE
-ioc_get_flags(self)
-    VALUE self;
+ioc_get_flags(VALUE self)
 {
     return INT2NUM(g_io_channel_get_flags(_SELF(self)));
 }
 
 static VALUE
-ioc_set_flags(self, flags)
-    VALUE self, flags;
+ioc_set_flags(VALUE self, VALUE flags)
 {
     GError* err = NULL;
     GIOStatus status = g_io_channel_set_flags(_SELF(self), 
@@ -591,8 +559,7 @@ ioc_set_flags(self, flags)
 
 /* Use them with GLib::IOChannel#gets, #readline, #readlines 
 static VALUE
-ioc_get_line_term(self)
-    VALUE self;
+ioc_get_line_term(VALUE self)
 {
     gint length;
     const gchar* ret = g_io_channel_get_line_term(_SELF(self), &length);
@@ -607,8 +574,7 @@ ioc_get_line_term(self)
 }    
 
 static VALUE
-ioc_set_line_term(self, line_term)
-    VALUE self, line_term;
+ioc_set_line_term(VALUE self, VALUE line_term)
 {
     StringValue(line_term);
     g_io_channel_set_line_term(_SELF(self), RVAL2CSTR(line_term),
@@ -618,37 +584,36 @@ ioc_set_line_term(self, line_term)
 */
 
 static VALUE
-ioc_get_buffered(self)
-    VALUE self;
+ioc_get_buffered(VALUE self)
 {
     return CBOOL2RVAL(g_io_channel_get_buffered(_SELF(self)));
 }
 
 static VALUE
-ioc_set_buffered(self, buffered)
-    VALUE self, buffered;
+ioc_set_buffered(VALUE self, VALUE buffered)
 {
     g_io_channel_set_buffered(_SELF(self), RVAL2CBOOL(buffered));
     return self;
 }
 
 static VALUE
-ioc_get_encoding(self)
-    VALUE self;
+ioc_get_encoding(VALUE self)
 {
     return CSTR2RVAL(g_io_channel_get_encoding(_SELF(self)));
 }
 
 static VALUE
-ioc_set_encoding(self, encoding)
-    VALUE self, encoding;
+ioc_set_encoding(VALUE self, VALUE encoding)
 {
     GError* err = NULL;
-    GIOStatus status = g_io_channel_set_encoding(_SELF(self), 
-                                                 encoding ? RVAL2CSTR(encoding) : NULL, &err);
+    GIOStatus status;
+
+    status = g_io_channel_set_encoding(_SELF(self),
+                                       RVAL2CSTR_ACCEPT_NIL(encoding),
+                                       &err);
     ioc_error(status, err);
     return self;
-} 
+}
 
 /* Don't we need them ?
 gboolean    g_io_channel_get_close_on_unref (GIOChannel *channel);
@@ -673,8 +638,7 @@ void        g_io_channel_close              (GIOChannel *channel);
 */
 
 static VALUE
-ioc_error_s_from_errno(self, errno_)
-    VALUE self, errno_;
+ioc_error_s_from_errno(VALUE self, VALUE errno_)
 {
     return INT2NUM(g_io_channel_error_from_errno(NUM2INT(errno_)));
 }
@@ -683,10 +647,7 @@ ioc_error_s_from_errno(self, errno_)
  * Stolen some convenient methods from io.c
  */
 static VALUE
-ioc_printf(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+ioc_printf(int argc, VALUE *argv, VALUE self)
 {
     ioc_write_chars(self, rb_f_sprintf(argc, argv));
     return Qnil;
@@ -695,8 +656,7 @@ ioc_printf(argc, argv, self)
 static VALUE ioc_puts(int argc, VALUE* argv, VALUE self);
 
 static VALUE
-ioc_puts_ary(ary, out, recur)
-    VALUE ary, out;
+ioc_puts_ary(VALUE ary, VALUE out, int recur)
 {
     VALUE tmp;
     long i;
@@ -712,10 +672,7 @@ ioc_puts_ary(ary, out, recur)
 }
 
 static VALUE
-ioc_puts(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ioc_puts(int argc, VALUE *argv, VALUE self)
 {
     int i;
     VALUE line;
@@ -756,10 +713,7 @@ ioc_puts(argc, argv, self)
 }
 
 static VALUE
-ioc_print(argc, argv, out)
-    int argc;
-    VALUE *argv;
-    VALUE out;
+ioc_print(int argc, VALUE *argv, VALUE out)
 {
     int i;
     VALUE line;