Changeset 13993

Timestamp:

2012-11-20T16:40:38+01:00 (11 years ago)

Author:

perost

Message:

• Got rid of GNU extension asprintf to please clang.

File:

• trunk/Compiler/runtime/systemimpl.c (modified) (2 diffs)

trunk/Compiler/runtime/systemimpl.c

@@ -1913 +1913 @@
 }
 
+char* alloc_locale_str(const char *locale, int llen, const char *suffix, int slen)
+{
+  char *loc = malloc(sizeof(char) * (llen + slen + 1));
+  assert(loc != NULL);
+  strncpy(loc, locale, llen);
+  strncpy(loc + llen, suffix, slen + 1);
+  return loc;
+}
+
 void SystemImpl__gettextInit(const char *locale)
 {
@@ -1936 +1945 @@
 #else
   /* We might get sent sv_SE when only sv_SE.utf8 exists, etc */
-  char *locale2 = NULL;
-  char *locale3 = NULL;
+  int locale_len = strlen(locale);
+  char *locale2 = alloc_locale_str(locale, locale_len, ".utf8", 5);
+  char *locale3 = alloc_locale_str(locale, locale_len, ".UTF-8", 6);
   char *old_ctype = strdup(setlocale(LC_CTYPE, ""));
   int old_ctype_is_utf8 = strcmp(nl_langinfo(CODESET), "UTF-8") == 0;
-  assert(asprintf(&locale2, "%s.utf8", locale) > 0);
-  assert(asprintf(&locale3, "%s.UTF-8", locale) > 0);
+
   int res = *locale == 0 ? setlocale(LC_MESSAGES, "") && setlocale(LC_CTYPE, ""):
     (setlocale(LC_MESSAGES, locale3) && setlocale(LC_CTYPE, locale3))  ||