Changeset 1801

Timestamp:

Jan 31, 2005, 5:18:52 AM (21 years ago)

Author:

bird

Message:

Bad & in collate.

File:

• trunk/src/emx/src/lib/locale/setlocale.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/locale/setlocale.c

@@ -397 +397 @@
         return rc;
 
-    if (&pCollate->mbcs)
+    if (pCollate->mbcs)
     {
         /*
@@ -1355 +1355 @@
             int     cch1 = strlen(pszLocale);
             int     cch2 = strlen(szCodepageActual);
-            int     cch3 = pszModifier ? strlen(pszModifier) : 0;
-            char   *psz = pTemp->Global.apszNames[iCategory + 1] = malloc(cch1 + cch2 + cch3 + !!cch3 + 2);
+            int     cch3 = pszModifier ? strlen(pszModifier) + 1 : 0;
+            char   *psz = pTemp->Global.apszNames[iCategory + 1] = malloc(cch1 + cch2 + cch3 + 2);
             if (!psz)
                 return -ENOMEM;
@@ -1365 +1365 @@
             memcpy(psz, szCodepageActual, cch2);
             psz += cch2;
+            *psz = '\0';
 
             if (cch3)
@@ -1370 +1371 @@
                 *psz++ = '@';
                 memcpy(psz, pszModifier, cch3);
-                psz += cch3;
             }
-            *psz = '\0';
 
             LIBCLOG_MSG2("Setting iCategory='%d''%s' locale value to '%s'\n",