Fix a warning.

[mono.git] / mono / metadata / locales.c

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index bcb0dc3c0146748719a55c6a9002fc609a2c61b4..9316b410cd6fcc1d13b13de6ca147141bdc9e98b 100644 (file)
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -133,7 +133,7 @@ create_names_array_idx (const guint16 *names, int ml, MonoError *error)
        return_val_if_nok (error, NULL);
 
        for(i = 0; i < ml; i++)
-               mono_array_setref (ret, i, mono_string_new (domain, idx2string (names [i])));
+               mono_array_setref (ret, i, mono_string_new (domain, dtidx2string (names [i])));
 
        return ret;
 }
@@ -162,7 +162,7 @@ create_names_array_idx_dynamic (const guint16 *names, int ml, MonoError *error)
        return_val_if_nok (error, NULL);
 
        for(i = 0; i < len; i++)
-               mono_array_setref (ret, i, mono_string_new (domain, idx2string (names [i])));
+               mono_array_setref (ret, i, mono_string_new (domain, pattern2string (names [i])));
 
        return ret;
 }
@@ -207,7 +207,7 @@ ves_icall_System_Globalization_CalendarData_fill_calendar_data (MonoCalendarData
        return_val_and_set_pending_if_nok (&error, FALSE);
        MONO_OBJECT_SETREF (this_obj, LongDatePatterns, long_date_patterns);
 
-       MONO_OBJECT_SETREF (this_obj, MonthDayPattern, mono_string_new (domain, idx2string (dfe->month_day_pattern)));
+       MONO_OBJECT_SETREF (this_obj, MonthDayPattern, mono_string_new (domain, pattern2string (dfe->month_day_pattern)));
 
        MonoArray *day_names = create_names_array_idx (dfe->day_names, NUM_DAYS, &error);
        return_val_and_set_pending_if_nok (&error, FALSE);
@@ -434,7 +434,7 @@ get_darwin_locale (void)
                                        len += bytes_converted + 1;
                                }
 
-                               darwin_locale = (char *) malloc (len + 1);
+                               darwin_locale = (char *) g_malloc (len + 1);
                                CFStringGetBytes (locale_language, CFRangeMake (0, CFStringGetLength (locale_language)), kCFStringEncodingMacRoman, 0, FALSE, (UInt8 *) darwin_locale, len, &bytes_converted);
 
                                darwin_locale[bytes_converted] = '-';
@@ -454,9 +454,9 @@ get_darwin_locale (void)
 
                        if (locale_cfstr) {
                                len = CFStringGetMaximumSizeForEncoding (CFStringGetLength (locale_cfstr), kCFStringEncodingMacRoman) + 1;
-                               darwin_locale = (char *) malloc (len);
+                               darwin_locale = (char *) g_malloc (len);
                                if (!CFStringGetCString (locale_cfstr, darwin_locale, len, kCFStringEncodingMacRoman)) {
-                                       free (darwin_locale);
+                                       g_free (darwin_locale);
                                        CFRelease (locale);
                                        darwin_locale = NULL;
                                        return NULL;