Changeset 1807

Timestamp:

Feb 2, 2005, 1:15:37 AM (21 years ago)

Author:

bird

Message:

Fixed bubble sort in collate.

File:

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

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

@@ -413 +413 @@
          */
         struct __collate_weight     aCW[256];
-        int                         i, j;
+        int                         i, c;
 
         /* Initialize character weights. */
@@ -439 +439 @@
          * of equal elements stays the same.
          */
-        /** @todo check this algorithm, it doesn't look right! */
-        for (i = 0; i < 255; i++)
-            for (j = i; j < 255; j++)
-                if (UniStrncmp(aCW[j].ucsWeight, aCW[j + 1].ucsWeight, MIN(aCW[j].len, aCW[j + 1].len)) > 0)
-                    _memswap(&aCW[j], &aCW[j + 1], sizeof(aCW[j]));
+        c = 256 - 1;
+        do
+        {
+            int j = 0;
+            for (i = 0; i < c; i++)
+                if (UniStrncmp(aCW[i].ucsWeight, aCW[i + 1].ucsWeight, MIN(aCW[i].len, aCW[i + 1].len)) > 0)
+                {
+                    _memswap(&aCW[i], &aCW[i + 1], sizeof(aCW[i]));
+                    j = i;
+                }
+            c = j;
+        } while (c);
 
         /*