Changeset 6c441cf8 in mainline for kernel/generic/src/lib/sort.c

Timestamp:

2008-02-27T11:49:17Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

56976a17

Parents:

fdb7795

Message:

code cleanup (mostly signed/unsigned)
allow extra compiler warnings

File:

• kernel/generic/src/lib/sort.c (modified) (1 diff)

kernel/generic/src/lib/sort.c

@@ -97 +97 @@
 {
         if (n > 4) {
-                int i = 0, j = n - 1;
+                unsigned int i = 0, j = n - 1;
 
                 memcpy(pivot, data, e_size);
 
                 while (1) {
-                        while ((cmp(data + i * e_size, pivot) < 0) && i < n) i++;
-                        while ((cmp(data + j * e_size, pivot) >=0) && j > 0) j--;
-                        if (i<j) {
+                        while ((cmp(data + i * e_size, pivot) < 0) && (i < n))
+                                i++;
+                        while ((cmp(data + j * e_size, pivot) >= 0) && (j > 0))
+                                j--;
+                        
+                        if (i < j) {
                                 memcpy(tmp, data + i * e_size, e_size);
                                 memcpy(data + i * e_size, data + j * e_size, e_size);