glib2 1.0.0 → 1.0.1

data/ext/glib2/rbglib_maincontext.c

@@ -537,28 +537,60 @@ mc_prepare(VALUE self)
     return rb_assoc_new(CBOOL2RVAL(ret), INT2NUM(priority));
 }
 
+struct mc_query_body_args {
+    GPollFD *fds;
+    gint timeout_;
+    gint ret;
+};
+
+static VALUE
+mc_query_body(VALUE value)
+{
+    struct mc_query_body_args *args = (struct mc_query_body_args *)value;
+    gint i;
+    VALUE ary = rb_ary_new();
+
+    for (i = 0; i < args->ret; i++)
+        rb_ary_push(ary, BOXED2RVAL(&args->fds[i], G_TYPE_POLL_FD));
+    
+    return rb_assoc_new(INT2NUM(args->timeout_), ary);
+}
+
+static VALUE
+mc_query_ensure(VALUE value)
+{
+    g_free((GPollFD *)value);
+
+    return Qnil;
+}
+
 static VALUE
 mc_query(VALUE self, VALUE max_priority)
 {
-    gint i, timeout_;
-    VALUE ary;
+    gint timeout_;
+    struct mc_query_body_args args;
    
-    GPollFD* fds = g_new (GPollFD, 100);
-    gint ret = g_main_context_query(_SELF(self), NUM2INT(max_priority), 
-                               &timeout_, fds, 100);
+    GPollFD *fds = g_new(GPollFD, 100);
+    gint ret = g_main_context_query(_SELF(self),
+                                    NUM2INT(max_priority), 
+                                    &timeout_,
+                                    fds,
+                                    100);
     if (ret > 100) {
         g_free(fds);
         fds = g_new(GPollFD, ret);
-        g_main_context_query(_SELF(self), NUM2INT(max_priority),
-                             &timeout_, fds, ret);
+        g_main_context_query(_SELF(self),
+                             NUM2INT(max_priority),
+                             &timeout_,
+                             fds,
+                             ret);
     }
 
-    ary = rb_ary_new();
-    for (i = 0; i < ret; i++)
-        rb_ary_push(ary, BOXED2RVAL(&fds[i], G_TYPE_POLL_FD));
-    
-    g_free(fds);
-    return rb_assoc_new(INT2NUM(timeout_), ary);
+    args.fds = fds;
+    args.timeout_ = timeout_;
+    args.ret = ret;
+    return rb_ensure(mc_query_body, (VALUE)&args,
+                     mc_query_ensure, (VALUE)fds);
 }
 
 /* How can I implement this?

data/ext/glib2/rbglib_messages.c

@@ -29,7 +29,8 @@ static VALUE rbglib_log_handler_procs;
 static ID id_call;
 static gboolean log_canceled;
 
-static gchar* logmessage(GLogLevelFlags level)
+static const gchar *
+logmessage(GLogLevelFlags level)
 {
     if (level & G_LOG_LEVEL_ERROR){
         return "ERROR";

data/ext/glib2/rbglib_shell.c

@@ -14,37 +14,29 @@
 static VALUE
 shell_parse(VALUE self, VALUE command_line)
 {
-    gint argc, i;
-    gchar** argv;
-    GError* err = NULL;
-    VALUE ary;
+    gint argc;
+    gchar **argv;
+    GError *error = NULL;
 
-    gboolean ret = g_shell_parse_argv(RVAL2CSTR(command_line),
-                                      &argc, &argv, &err);
+    if (!g_shell_parse_argv(RVAL2CSTR(command_line), &argc, &argv, &error))
+        RAISE_GERROR(error);
 
-    if (! ret) RAISE_GERROR(err);
-
-    ary = rb_ary_new();
-    for (i = 0; i < argc; i++) {
-        rb_ary_push(ary, CSTR2RVAL(argv[i]));
-    }
-    g_strfreev (argv);
-    return ary;
+    return STRV2RVAL_FREE(argv);
 }
 
 static VALUE
 shell_quote(VALUE self, VALUE unquoted_string)
 {
-    return CSTR2RVAL_FREE(g_shell_quote((const gchar*)RVAL2CSTR(unquoted_string)));
+    return CSTR2RVAL_FREE(g_shell_quote(RVAL2CSTR(unquoted_string)));
 }
 
 static VALUE
 shell_unquote(VALUE self, VALUE quoted_string)
 {
-    GError* err = NULL;
-    gchar* str = g_shell_unquote((const gchar*)RVAL2CSTR(quoted_string), &err);
-
-    if (! str) RAISE_GERROR(err);
+    GError *error = NULL;
+    gchar *str = g_shell_unquote(RVAL2CSTR(quoted_string), &error);
+    if (str == NULL)
+        RAISE_GERROR(error);
 
     return CSTR2RVAL_FREE(str);
 }

data/ext/glib2/rbglib_spawn.c

@@ -31,9 +31,8 @@ rbglib_m_spawn_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv,
     gboolean ret;
     GPid child_pid;
     VALUE func = Qnil;
-    gint gargc, genc, i;
-    gchar** gargv = (gchar**)NULL;
-    gchar** genvp = (gchar**)NULL;
+    gchar **gargv;
+    gchar **genvp;
     gint standard_input, standard_output, standard_error;
 
     if (rb_block_given_p()) {
@@ -41,36 +40,8 @@ rbglib_m_spawn_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv,
         G_RELATIVE(self, func);
     }
 
-    if (! NIL_P(argv)){
-        Check_Type(argv, T_ARRAY);
-        gargc = RARRAY_LEN(argv);
-        gargv = ALLOCA_N(gchar*, gargc + 1);
-        for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
-            }
-            else {
-                gargv[i] = "";
-            }
-        }
-        gargv[gargc] = (gchar*)NULL;
-    }
-
-    if (! NIL_P(envp)){
-        Check_Type(envp, T_ARRAY);
-        genc = RARRAY_LEN(envp);
-        genvp = ALLOCA_N(gchar*, genc + 1);
-        for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
-            }
-            else {
-                genvp[i] = "";
-            }
-        }
-        genvp[genc] = (gchar*)NULL;
-    }
-
+    gargv = (gchar **)RVAL2STRV(argv);
+    genvp = (gchar **)RVAL2STRV(envp);
     ret = g_spawn_async_with_pipes(NIL_P(working_directory) ? NULL : RVAL2CSTR(working_directory),
                                    gargv, genvp, NUM2INT(flags),
                                    (GSpawnChildSetupFunc)child_setup, 
@@ -78,8 +49,10 @@ rbglib_m_spawn_async_with_pipes(VALUE self, VALUE working_directory, VALUE argv,
                                    &child_pid, 
                                    &standard_input, &standard_output,
                                    &standard_error, &err);
-    
-    if (! ret) RAISE_GERROR(err);
+    g_free(gargv);
+    g_free(genvp);
+    if (!ret)
+        RAISE_GERROR(err);
     
     return rb_ary_new3(4, INT2NUM((gint)child_pid), 
                        rb_funcall(rb_cIO, id_new, 1, INT2NUM(standard_input)),
@@ -94,54 +67,25 @@ rbglib_m_spawn_async(VALUE self, VALUE working_directory, VALUE argv, VALUE envp
     gboolean ret;
     GPid child_pid;
     VALUE func = Qnil;
-    gint gargc, genc, i;
-    gchar** gargv = (gchar**)NULL;
-    gchar** genvp = (gchar**)NULL;
+    gchar **gargv;
+    gchar **genvp;
 
     if (rb_block_given_p()) {
         func = rb_block_proc();
         G_RELATIVE(self, func);
     }
 
-    if (! NIL_P(argv)){
-        Check_Type(argv, T_ARRAY);
-        gargc = RARRAY_LEN(argv);
-        gargv = ALLOCA_N(gchar*, gargc + 1);
-        for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
-            }
-            else {
-                gargv[i] = "";
-            }
-        }
-        gargv[gargc] = (gchar*)NULL;
-    }
-
-    if (! NIL_P(envp)){
-        Check_Type(envp, T_ARRAY);
-        genc = RARRAY_LEN(envp);
-        genvp = ALLOCA_N(gchar*, genc + 1);
-        for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
-            }
-            else {
-                genvp[i] = "";
-            }
-        }
-        genvp[genc] = (gchar*)NULL;
-    }
-
+    gargv = (gchar **)RVAL2STRV(argv);
+    genvp = (gchar **)RVAL2STRV(envp);
     ret = g_spawn_async(NIL_P(working_directory) ? NULL : RVAL2CSTR(working_directory),
                         gargv, genvp, NUM2INT(flags),
                         (GSpawnChildSetupFunc)child_setup, (gpointer)func,
                         &child_pid, &err);
-
-    if (! ret){
+    g_free(gargv);
+    g_free(genvp);
+    if (!ret)
         RAISE_GERROR(err);
-    }
-    
+
     return INT2NUM((int)child_pid);
 }
 
@@ -151,9 +95,8 @@ rbglib_m_spawn_sync(VALUE self, VALUE working_directory, VALUE argv, VALUE envp,
     GError *err = NULL;
     gboolean ret;
     VALUE func = Qnil;
-    gint gargc, genc, i;
-    gchar** gargv = (gchar**)NULL;
-    gchar** genvp = (gchar**)NULL;
+    gchar** gargv;
+    gchar** genvp;
     gchar *standard_output = NULL, *standard_error = NULL;
     gint exit_status;
     VALUE std_out, std_err;
@@ -163,46 +106,17 @@ rbglib_m_spawn_sync(VALUE self, VALUE working_directory, VALUE argv, VALUE envp,
         G_RELATIVE(self, func);
     }
 
-    if (! NIL_P(argv)){
-        Check_Type(argv, T_ARRAY);
-        gargc = RARRAY_LEN(argv);
-        gargv = ALLOCA_N(gchar*, gargc + 1);
-        for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
-            }
-            else {
-                gargv[i] = "";
-            }
-        }
-        gargv[gargc] = (gchar*)NULL;
-    }
-
-    if (! NIL_P(envp)){
-        Check_Type(envp, T_ARRAY);
-        genc = RARRAY_LEN(envp);
-        genvp = ALLOCA_N(gchar*, genc + 1);
-        for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
-            }
-            else {
-                genvp[i] = "";
-            }
-        }
-        genvp[genc] = (gchar*)NULL;
-    }
-
+    gargv = (gchar **)RVAL2STRV(argv);
+    genvp = (gchar **)RVAL2STRV(envp);
     ret = g_spawn_sync(NIL_P(working_directory) ? NULL : RVAL2CSTR(working_directory),
                        gargv, genvp, NUM2INT(flags),
                        (GSpawnChildSetupFunc)child_setup, (gpointer)func,
                        &standard_output, &standard_error,
                        &exit_status, &err);
-
-
-    if (! ret){
+    g_free(gargv);
+    g_free(genvp);
+    if (!ret)
         RAISE_GERROR(err);
-    }
 
     if (standard_output) {
         std_out = CSTR2RVAL(standard_output);
@@ -279,12 +193,16 @@ rbglib_m_spawn_command_line_async(VALUE self, VALUE str)
 }
 
 #ifdef HAVE_G_SPAWN_CLOSE_PID
+
+#define RVAL2GPID(value) ((GPid)NUM2INT(pid))
+
 static VALUE
 rbglib_m_spawn_close_pid(VALUE self, VALUE pid)
 {
-    g_spawn_close_pid(NUM2INT(pid));
+    g_spawn_close_pid(RVAL2GPID(pid));
     return Qnil;
 }
+
 #endif
 
 void

data/ext/glib2/rbglib_utils.c

@@ -120,29 +120,16 @@ rbglib_m_user_config_dir(VALUE self)
     return CSTR2RVAL(g_get_user_config_dir());
 }
 
-static VALUE
-strv_to_array(const gchar * const *strv)
-{
-    VALUE array;
-
-    array = rb_ary_new();
-    for (; *strv; strv++) {
-	rb_ary_push(array, CSTR2RVAL(*strv));
-    }
-
-    return array;
-}
-
 static VALUE
 rbglib_m_system_data_dirs(VALUE self)
 {
-    return strv_to_array(g_get_system_data_dirs());
+    return STRV2RVAL((const gchar **)g_get_system_data_dirs());
 }
 
 static VALUE
 rbglib_m_system_config_dirs(VALUE self)
 {
-    return strv_to_array(g_get_system_config_dirs());
+    return STRV2RVAL((const gchar **)g_get_system_config_dirs());
 }
 #endif
 
@@ -254,21 +241,19 @@ static VALUE
 rbglib_m_parse_debug_string(VALUE self, VALUE string, VALUE keys)
 {
     gint i, nkeys;
-    VALUE ary, ret;
+    VALUE ary;
     GDebugKey* gkeys;
 
     Check_Type(keys, T_HASH);
     ary = rb_funcall(keys, rb_intern("to_a"), 0);
     nkeys = RARRAY_LEN(ary);
-    gkeys = g_new(GDebugKey, nkeys);
+    gkeys = ALLOCA_N(GDebugKey, nkeys);
     for (i = 0; i < nkeys; i++) {
         gkeys[i].key = RVAL2CSTR(RARRAY_PTR(RARRAY_PTR(ary)[i])[0]);
         gkeys[i].value = NUM2UINT(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
     }
    
-    ret = UINT2NUM(g_parse_debug_string(RVAL2CSTR(string), gkeys, nkeys));
-    g_free(gkeys);
-    return ret;
+    return UINT2NUM(g_parse_debug_string(RVAL2CSTR(string), gkeys, nkeys));
 }
 
 /*

data/ext/glib2/rbgobj_closure.c

@@ -33,7 +33,7 @@ struct _GRClosure
 static VALUE
 rclosure_default_g2r_func(guint num, const GValue *values)
 {
-    int i;
+    guint i;
     VALUE args = rb_ary_new2(num);
     for (i = 0; i < num; i++)
         rb_ary_store(args, i, GVAL2RVAL(&values[i]));
@@ -323,7 +323,8 @@ Init_closure()
 
 /**********************************************************************/
 
-void Init_gobject_gclosure()
+void
+Init_gobject_gclosure()
 {
     Init_rclosure();
     Init_closure();

data/ext/glib2/rbgobj_enums.c

@@ -164,7 +164,7 @@ rbgobj_enum_add_constants(VALUE mod, GType enum_type,
                           const gchar *strip_prefix)
 {
     GEnumClass *gclass;
-    int i;
+    guint i;
     int prefix_len = strlen(strip_prefix);
 
     gclass = G_ENUM_CLASS(g_type_class_ref(enum_type));
@@ -190,7 +190,7 @@ rbgobj_flags_add_constants(VALUE mod, GType flags_type,
                            const gchar *strip_prefix)
 {
     GFlagsClass *gclass;
-    int i;
+    guint i;
     int prefix_len = strlen(strip_prefix);
 
     gclass = G_FLAGS_CLASS(g_type_class_ref(flags_type));
@@ -296,7 +296,7 @@ void
 rbgobj_init_enum_class(VALUE klass)
 {
     GEnumClass* gclass = g_type_class_ref(CLASS2GTYPE(klass));
-    int i;
+    guint i;
 
     for (i = 0; i < gclass->n_values; i++) {
         GEnumValue* entry = &(gclass->values[i]);
@@ -342,24 +342,44 @@ enum_s_range(VALUE self)
     return result;
 }
 
+struct enum_s_values_body_args {
+    GEnumClass *gclass;
+    VALUE self;
+};
+
 static VALUE
-enum_s_values(VALUE self)
+enum_s_values_body(VALUE value)
 {
-    GEnumClass *gclass;
-    VALUE result;
-    int i;
+    struct enum_s_values_body_args *args = (struct enum_s_values_body_args *)value;
+    VALUE result = rb_ary_new();
+    guint i;
 
-    gclass = g_type_class_ref(CLASS2GTYPE(self));;
-    result = rb_ary_new();
-    for (i = 0; i < gclass->n_values; i++) {
-        GEnumValue *p = &(gclass->values[i]);
-        rb_ary_push(result, make_enum(p->value, self));
-    }
+    for (i = 0; i < args->gclass->n_values; i++)
+        rb_ary_push(result, make_enum(args->gclass->values[i].value, args->self));
 
-    g_type_class_unref(gclass);
     return result;
 }
 
+static VALUE
+enum_s_values_ensure(VALUE gclass)
+{
+    g_type_class_unref((GEnumClass *)gclass);
+
+    return Qnil;
+}
+
+static VALUE
+enum_s_values(VALUE self)
+{
+    struct enum_s_values_body_args args = {
+        g_type_class_ref(CLASS2GTYPE(self)),
+        self
+    };
+
+    return rb_ensure(enum_s_values_body, (VALUE)&args,
+                     enum_s_values_ensure, (VALUE)args.gclass);
+}
+
 static VALUE
 enum_s_allocate(VALUE self)
 {
@@ -573,7 +593,7 @@ rbgobj_init_flags_class(VALUE klass)
 {
     GFlagsClass* gclass = g_type_class_ref(CLASS2GTYPE(klass));
     GString* source = g_string_new(NULL);
-    int i;
+    guint i;
 
     for (i = 0; i < gclass->n_values; i++) {
         GFlagsValue* entry = &(gclass->values[i]);
@@ -639,7 +659,7 @@ flags_s_values(VALUE klass)
 {
     GFlagsClass *gclass;
     VALUE result;
-    int i;
+    guint i;
 
     gclass = g_type_class_ref(CLASS2GTYPE(klass));
     result = rb_ary_new();
@@ -694,7 +714,7 @@ flags_initialize(int argc, VALUE* argv, VALUE self)
     }
 
     if (!p->info) {
-        int i;
+        guint i;
         for (i = 0; i < p->gclass->n_values; i++){
             GFlagsValue* val = &(p->gclass->values[i]);
             if (val->value == p->value){