Changeset 7f1c620 in mainline for generic/src/lib/sort.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• generic/src/lib/sort.c (modified) (3 diffs)

generic/src/lib/sort.c

@@ -64 +64 @@
 void qsort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b))
 {
-        __u8 buf_tmp[EBUFSIZE];
-        __u8 buf_pivot[EBUFSIZE];
+        uint8_t buf_tmp[EBUFSIZE];
+        uint8_t buf_pivot[EBUFSIZE];
         void * tmp = buf_tmp;
         void * pivot = buf_pivot;
@@ -133 +133 @@
 void bubblesort(void * data, count_t n, size_t e_size, int (* cmp) (void * a, void * b))
 {
-        __u8 buf_slot[EBUFSIZE];
+        uint8_t buf_slot[EBUFSIZE];
         void * slot = buf_slot;
         
@@ -185 +185 @@
 }
 
-int __u8_cmp(void * a, void * b)
-{
-        return (* (__u8 *) a > * (__u8 *)b) ? 1 : (*(__u8 *)a < * (__u8 *)b) ? -1 : 0;
-}
-
-int __u16_cmp(void * a, void * b)
-{
-        return (* (__u16 *) a > * (__u16 *)b) ? 1 : (*(__u16 *)a < * (__u16 *)b) ? -1 : 0;
-}
-
-int __u32_cmp(void * a, void * b)
-{
-        return (* (__u32 *) a > * (__u32 *)b) ? 1 : (*(__u32 *)a < * (__u32 *)b) ? -1 : 0;
+int uint8_t_cmp(void * a, void * b)
+{
+        return (* (uint8_t *) a > * (uint8_t *)b) ? 1 : (*(uint8_t *)a < * (uint8_t *)b) ? -1 : 0;
+}
+
+int uint16_t_cmp(void * a, void * b)
+{
+        return (* (uint16_t *) a > * (uint16_t *)b) ? 1 : (*(uint16_t *)a < * (uint16_t *)b) ? -1 : 0;
+}
+
+int uint32_t_cmp(void * a, void * b)
+{
+        return (* (uint32_t *) a > * (uint32_t *)b) ? 1 : (*(uint32_t *)a < * (uint32_t *)b) ? -1 : 0;
 }