glib2 0.90.7 → 0.90.8

data/ext/glib2/rbglib_unicode.c

@@ -12,12 +12,38 @@
 #include "rbgprivate.h"
 #include "rbglib.h"
 
+static VALUE
+rbg_ucs4_to_rval_len(const gchar* ucs4, gsize len)
+{
+    const gchar *ucs4_encoding;
+#if  G_BYTE_ORDER == G_LITTLE_ENDIAN
+    ucs4_encoding = "UTF-32LE";
+#else
+    ucs4_encoding = "UTF-32BE";
+#endif
+
+    return CSTR2RVAL_LEN_ENC(ucs4, len, ucs4_encoding);
+}
+
+static VALUE
+rbg_utf16_to_rval_len(const gchar* utf16, gsize len)
+{
+    const gchar *utf16_encoding;
+#if  G_BYTE_ORDER == G_LITTLE_ENDIAN
+    utf16_encoding = "UTF-16LE";
+#else
+    utf16_encoding = "UTF-16BE";
+#endif
+
+    return CSTR2RVAL_LEN_ENC(utf16, len, utf16_encoding);
+}
+
 static VALUE
 rbglib_m_charset(VALUE self)
 {
     const char *charset;
     g_get_charset(&charset);
-    return rb_str_new2(charset);
+    return CSTR2RVAL(charset);
 }
 
 #define DEF_IS_UNICHAR(name)                                    \
@@ -103,7 +129,7 @@ rbglib_m_unicode_canonical_ordering(VALUE self, VALUE rb_ucs4)
     len = RSTRING_LEN(rb_ucs4);
     ucs4 = g_memdup(original_str, len);
     g_unicode_canonical_ordering(ucs4, len);
-    normalized_ucs4 = rb_str_new((const char *)ucs4, len);
+    normalized_ucs4 = rbg_ucs4_to_rval_len((const char *)ucs4, len);
     g_free(ucs4);
     return normalized_ucs4;
 }
@@ -116,7 +142,8 @@ rbglib_m_unicode_canonical_decomposition(VALUE self, VALUE unichar)
     gsize len;
 
     ucs4 = g_unicode_canonical_decomposition(NUM2UINT(unichar), &len);
-    normalized_ucs4 = rb_str_new((const char *)ucs4, len * sizeof(gunichar));
+    normalized_ucs4 = rbg_ucs4_to_rval_len((const char *)ucs4,
+                                           len * sizeof(gunichar));
     g_free(ucs4);
     return normalized_ucs4;
 }
@@ -203,7 +230,7 @@ rbglib_m_utf8_strreverse(VALUE self, VALUE rb_utf8)
 
     utf8 = StringValueCStr(rb_utf8);
     reversed_utf8 = g_utf8_strreverse(utf8, RSTRING_LEN(rb_utf8));
-    result = rb_str_new2(reversed_utf8);
+    result = CSTR2RVAL(reversed_utf8);
     g_free(reversed_utf8);
     return result;
 }
@@ -224,7 +251,7 @@ rbglib_m_utf8_strup(VALUE self, VALUE rb_utf8)
 
     utf8 = StringValueCStr(rb_utf8);
     upcased_utf8 = g_utf8_strup(utf8, RSTRING_LEN(rb_utf8));
-    result = rb_str_new2(upcased_utf8);
+    result = CSTR2RVAL(upcased_utf8);
     g_free(upcased_utf8);
     return result;
 }
@@ -237,7 +264,7 @@ rbglib_m_utf8_strdown(VALUE self, VALUE rb_utf8)
 
     utf8 = StringValueCStr(rb_utf8);
     downcased_utf8 = g_utf8_strdown(utf8, RSTRING_LEN(rb_utf8));
-    result = rb_str_new2(downcased_utf8);
+    result = CSTR2RVAL(downcased_utf8);
     g_free(downcased_utf8);
     return result;
 }
@@ -250,7 +277,7 @@ rbglib_m_utf8_casefold(VALUE self, VALUE rb_utf8)
 
     utf8 = StringValueCStr(rb_utf8);
     casefolded_utf8 = g_utf8_casefold(utf8, RSTRING_LEN(rb_utf8));
-    result = rb_str_new2(casefolded_utf8);
+    result = CSTR2RVAL(casefolded_utf8);
     g_free(casefolded_utf8);
     return result;
 }
@@ -269,7 +296,7 @@ rbglib_m_utf8_normalize(int argc, VALUE *argv, VALUE self)
 
     utf8 = StringValueCStr(rb_utf8);
     normalized_utf8 = g_utf8_normalize(utf8, RSTRING_LEN(rb_utf8), mode);
-    result = rb_str_new2(normalized_utf8);
+    result = CSTR2RVAL(normalized_utf8);
     g_free(normalized_utf8);
     return result;
 }
@@ -299,7 +326,7 @@ rbglib_m_utf8_collate_key(int argc, VALUE *argv, VALUE self)
 #endif
         key = g_utf8_collate_key(utf8, len);
 
-    result = rb_str_new2(key);
+    result = CSTR2RVAL(key);
     g_free(key);
     return result;
 }
@@ -321,7 +348,8 @@ rbglib_m_utf8_to_utf16(VALUE self, VALUE rb_utf8)
     if (error)
         RAISE_GERROR(error);
 
-    result = rb_str_new((char *)utf16, items_written * sizeof(*utf16));
+    result = rbg_utf16_to_rval_len((char *)utf16,
+                                   items_written * sizeof(*utf16));
     g_free(utf16);
     return result;
 }
@@ -349,7 +377,7 @@ rbglib_m_utf8_to_ucs4(int argc, VALUE *argv, VALUE self)
             RAISE_GERROR(error);
     }
 
-    result = rb_str_new((char *)ucs4, items_written * sizeof(*ucs4));
+    result = rbg_ucs4_to_rval_len((char *)ucs4, items_written * sizeof(*ucs4));
     g_free(ucs4);
     return result;
 }
@@ -371,7 +399,7 @@ rbglib_m_utf16_to_ucs4(VALUE self, VALUE rb_utf16)
     if (error)
         RAISE_GERROR(error);
 
-    result = rb_str_new((char *)ucs4, items_written * sizeof(*ucs4));
+    result = rbg_ucs4_to_rval_len((char *)ucs4, items_written * sizeof(*ucs4));
     g_free(ucs4);
     return result;
 }
@@ -393,7 +421,7 @@ rbglib_m_utf16_to_utf8(VALUE self, VALUE rb_utf16)
     if (error)
         RAISE_GERROR(error);
 
-    result = rb_str_new(utf8, items_written * sizeof(*utf8));
+    result = CSTR2RVAL_LEN(utf8, items_written * sizeof(*utf8));
     g_free(utf8);
     return result;
 }
@@ -415,7 +443,8 @@ rbglib_m_ucs4_to_utf16(VALUE self, VALUE rb_ucs4)
     if (error)
         RAISE_GERROR(error);
 
-    result = rb_str_new((char *)utf16, items_written * sizeof(*utf16));
+    result = rbg_utf16_to_rval_len((char *)utf16,
+                                   items_written * sizeof(*utf16));
     g_free(utf16);
     return result;
 }
@@ -437,7 +466,7 @@ rbglib_m_ucs4_to_utf8(VALUE self, VALUE rb_ucs4)
     if (error)
         RAISE_GERROR(error);
 
-    result = rb_str_new(utf8, items_written);
+    result = CSTR2RVAL_LEN(utf8, items_written);
     g_free(utf8);
     return result;
 }
@@ -449,7 +478,7 @@ rbglib_m_unichar_to_utf8(VALUE self, VALUE unichar)
     gint len;
 
     len = g_unichar_to_utf8(NUM2UINT(unichar), utf8);
-    return rb_str_new(utf8, len);
+    return CSTR2RVAL_LEN(utf8, len);
 }
 
 void

data/ext/glib2/rbglib_utils.c

@@ -15,15 +15,13 @@
 
 #if GLIB_CHECK_VERSION(2,2,0)
 static VALUE
-rbglib_m_application_name(self)
-    VALUE self;
+rbglib_m_application_name(VALUE self)
 {
     return CSTR2RVAL(g_get_application_name());
 }
 
 static VALUE
-rbglib_m_set_application_name(self, application_name)
-    VALUE self, application_name;
+rbglib_m_set_application_name(VALUE self, VALUE application_name)
 {
     g_set_prgname(NIL_P(application_name) ? NULL : RVAL2CSTR(application_name));
     return self;
@@ -31,31 +29,27 @@ rbglib_m_set_application_name(self, application_name)
 #endif
 
 static VALUE
-rbglib_m_prgname(self)
-    VALUE self;
+rbglib_m_prgname(VALUE self)
 {
     return CSTR2RVAL(g_get_prgname());
 }
 
 static VALUE
-rbglib_m_set_prgname(self, prgname)
-    VALUE self, prgname;
+rbglib_m_set_prgname(VALUE self, VALUE prgname)
 {
     g_set_prgname(NIL_P(prgname) ? NULL : RVAL2CSTR(prgname));
     return self;
 }
 
 static VALUE
-rbglib_m_env(self, variable)
-    VALUE self, variable;
+rbglib_m_env(VALUE self, VALUE variable)
 {
     return CSTR2RVAL(g_getenv(RVAL2CSTR(variable)));
 }
 
 #if GLIB_CHECK_VERSION(2,4,0)
 static VALUE
-rbglib_m_setenv(self, variable, value, overwrite)
-    VALUE self, variable, value, overwrite;
+rbglib_m_setenv(VALUE self, VALUE variable, VALUE value, VALUE overwrite)
 {
     return CBOOL2RVAL(g_setenv(RVAL2CSTR(variable), 
                                NIL_P(value) ? NULL : RVAL2CSTR(value),
@@ -63,8 +57,7 @@ rbglib_m_setenv(self, variable, value, overwrite)
 }
 
 static VALUE
-rbglib_m_unsetenv(self, variable)
-    VALUE self, variable;
+rbglib_m_unsetenv(VALUE self, VALUE variable)
 {
     g_unsetenv(RVAL2CSTR(variable));
     return self;
@@ -74,8 +67,7 @@ rbglib_m_unsetenv(self, variable)
 #if GLIB_CHECK_VERSION(2,8,0)
 #if HAVE_G_LISTENV
 static VALUE
-rbglib_m_listenv(self)
-    VALUE self;
+rbglib_m_listenv(VALUE self)
 {
     gchar** c_list;
     gchar** c_var;
@@ -91,23 +83,20 @@ rbglib_m_listenv(self)
 #endif
 
 static VALUE
-rbglib_m_host_name(self)
-    VALUE self;
+rbglib_m_host_name(VALUE self)
 {
     return CSTR2RVAL(g_get_host_name());
 }
 #endif
 
 static VALUE
-rbglib_m_user_name(self)
-    VALUE self;
+rbglib_m_user_name(VALUE self)
 {
     return CSTR2RVAL(g_get_user_name());
 }
 
 static VALUE
-rbglib_m_real_name(self)
-    VALUE self;
+rbglib_m_real_name(VALUE self)
 {
     return CSTR2RVAL(g_get_real_name());
 }
@@ -167,22 +156,19 @@ rbglib_m_get_user_special_dir(VALUE self, VALUE directory)
 #endif
 
 static VALUE
-rbglib_m_home_dir(self)
-    VALUE self;
+rbglib_m_home_dir(VALUE self)
 {
     return CSTR2RVAL(g_get_home_dir());
 }
 
 static VALUE
-rbglib_m_tmp_dir(self)
-    VALUE self;
+rbglib_m_tmp_dir(VALUE self)
 {
     return CSTR2RVAL(g_get_tmp_dir());
 }
 
 static VALUE
-rbglib_m_current_dir(self)
-    VALUE self;
+rbglib_m_current_dir(VALUE self)
 {
     gchar* dir = g_get_current_dir();
     VALUE ret = CSTR2RVAL(dir);
@@ -191,29 +177,25 @@ rbglib_m_current_dir(self)
 }
 
 static VALUE
-rbglib_m_path_is_absolute(self, fname)
-    VALUE self, fname;
+rbglib_m_path_is_absolute(VALUE self, VALUE fname)
 {
     return CBOOL2RVAL(g_path_is_absolute(RVAL2CSTR(fname)));
 }
 
 static VALUE
-rbglib_m_path_skip_root(self, fname)
-    VALUE self, fname;
+rbglib_m_path_skip_root(VALUE self, VALUE fname)
 {
     return CSTR2RVAL(g_path_skip_root(RVAL2CSTR(fname)));
 }
 
 static VALUE
-rbglib_m_path_get_basename(self, fname)
-    VALUE self, fname;
+rbglib_m_path_get_basename(VALUE self, VALUE fname)
 {
     return CSTR2RVAL(g_path_get_basename(RVAL2CSTR(fname)));
 }
 
 static VALUE
-rbglib_m_path_get_dirname(self, fname)
-    VALUE self, fname;
+rbglib_m_path_get_dirname(VALUE self, VALUE fname)
 {
     return CSTR2RVAL(g_path_get_dirname(RVAL2CSTR(fname)));
 }
@@ -231,8 +213,7 @@ gchar*      g_build_pathv                   (const gchar *separator,
 */
 
 static VALUE
-rbglib_m_find_program_in_path(self, program)
-    VALUE self, program;
+rbglib_m_find_program_in_path(VALUE self, VALUE program)
 {
     gchar* path = g_find_program_in_path(RVAL2CSTR(program));
     VALUE ret = CSTR2RVAL(path);
@@ -241,29 +222,25 @@ rbglib_m_find_program_in_path(self, program)
 }
 
 static VALUE
-rbglib_m_bit_nth_lsf(self, mask, nth_bit)
-    VALUE self, mask, nth_bit;
+rbglib_m_bit_nth_lsf(VALUE self, VALUE mask, VALUE nth_bit)
 {
     return INT2NUM(g_bit_nth_lsf(NUM2ULONG(mask), NUM2INT(nth_bit)));
 }
 
 static VALUE
-rbglib_m_bit_nth_msf(self, mask, nth_bit)
-    VALUE self, mask, nth_bit;
+rbglib_m_bit_nth_msf(VALUE self, VALUE mask, VALUE nth_bit)
 {
     return INT2NUM(g_bit_nth_msf(NUM2ULONG(mask), NUM2INT(nth_bit)));
 }
 
 static VALUE
-rbglib_m_bit_storage(self, number)
-    VALUE self, number;
+rbglib_m_bit_storage(VALUE self, VALUE number)
 {
     return UINT2NUM(g_bit_storage(NUM2ULONG(number)));
 }
 
 static VALUE
-rbglib_m_spaced_primes_closest(self, num)
-    VALUE self, num;
+rbglib_m_spaced_primes_closest(VALUE self, VALUE num)
 {
     return UINT2NUM(g_spaced_primes_closest(NUM2UINT(num)));
 }
@@ -274,8 +251,7 @@ void        g_atexit                        (GVoidFunc func);
 */
 
 static VALUE
-rbglib_m_parse_debug_string(self, string, keys)
-    VALUE self, string, keys;
+rbglib_m_parse_debug_string(VALUE self, VALUE string, VALUE keys)
 {
     gint i, nkeys;
     VALUE ary, ret;
@@ -310,8 +286,7 @@ void        g_nullify_pointer               (gpointer *nullify_location);
 */
 
 static VALUE
-rbglib_m_check_version(self, major, minor, micro)
-    VALUE self, major, minor, micro;
+rbglib_m_check_version(VALUE self, VALUE major, VALUE minor, VALUE micro)
 {
     return CBOOL2RVAL(glib_major_version > NUM2UINT(major) ||
                       (glib_major_version == NUM2UINT(major) && 

data/ext/glib2/rbglib_win32.c

@@ -16,38 +16,33 @@
 
 #ifdef G_OS_WIN32
 static VALUE
-rbglib_m_win32_error_message(self, error)
-    VALUE self, error;
+rbglib_m_win32_error_message(VALUE self, VALUE error)
 {
     return CSTR2RVAL_FREE(g_win32_error_message(NUM2INT(error)));
 }
 
 static VALUE
-rbglib_m_win32_locale(self)
-    VALUE self;
+rbglib_m_win32_locale(VALUE self)
 {
     return CSTR2RVAL_FREE(g_win32_getlocale());
 }
 
 static VALUE
-rbglib_m_win32_locale_deprecated(self)
-  VALUE self;
+rbglib_m_win32_locale_deprecated(VALUE self)
 {
 	rb_warn("GLib.win32_locale() is deprecated. Use GLib::Win32.locale instead");
 	return rbglib_m_win32_locale(self);
 }
 
 static VALUE
-rbglib_m_win32_get_package_installation_directory(self, package, dll_name)
-  VALUE self, package, dll_name;
+rbglib_m_win32_get_package_installation_directory(VALUE self, VALUE package, VALUE dll_name)
 {
 	return CSTR2RVAL_FREE(g_win32_get_package_installation_directory(RVAL2CSTR(package), 
 	                                                            RVAL2CSTR(dll_name)));
 }
 
 static VALUE
-rbglib_m_get_package_installation_subdirectory(self, package, dll_name, subdir)
-  VALUE self, package, dll_name, subdir;
+rbglib_m_get_package_installation_subdirectory(VALUE self, VALUE package, VALUE dll_name, VALUE subdir)
 {
 	return CSTR2RVAL_FREE(g_win32_get_package_installation_subdirectory(RVAL2CSTR(package), 
 	                                                                RVAL2CSTR(dll_name),
@@ -56,8 +51,7 @@ rbglib_m_get_package_installation_subdirectory(self, package, dll_name, subdir)
 
 #if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
-rbglib_m_get_windows_version(self)
-  VALUE self;
+rbglib_m_get_windows_version(VALUE self)
 {
 	return UINT2NUM(g_win32_get_windows_version());
 }
@@ -65,18 +59,17 @@ rbglib_m_get_windows_version(self)
 
 #if GLIB_CHECK_VERSION(2,8,0)
 static VALUE
-rbglib_m_win32_locale_filename_from_utf8(self, utf8_filename)
-    VALUE self, utf8_filename;
+rbglib_m_win32_locale_filename_from_utf8(VALUE self, VALUE utf8_filename)
 {
     return CSTR2RVAL_FREE(g_win32_locale_filename_from_utf8(RVAL2CSTR(utf8_filename)));
 }
 
 static VALUE
-rbglib_m_win32_locale_filename_from_utf8_deprecated(self)
-  VALUE self;
+rbglib_m_win32_locale_filename_from_utf8_deprecated(VALUE self,
+                                                    VALUE utf8_filename)
 {
 	rb_warn("GLib.win32_locale_filename_from_utf8() is deprecated. Use GLib::Win32.locale_filename_from_utf8 instead");
-	return rbglib_m_win32_locale_filename_from_utf8(self);
+	return rbglib_m_win32_locale_filename_from_utf8(self, utf8_filename);
 }
 
 #endif