Changeset bb68433 in mainline for generic/src/lib/sort.c

Timestamp:

2006-02-08T22:58:06Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7e4e532

Parents:

85dc2e7

Message:

Changed malloc to include second parameter and documented
recommended usage.
Added zone merging, made ia32 & amd64 to merge found zones.

File:

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

generic/src/lib/sort.c

@@ -42 +42 @@
  * the pivot and temporary elements for generic quicksort algorithm.
  * 
+ * This function _can_ sleep
+ *
  * @param data Pointer to data to be sorted.
  * @param n Number of elements to be sorted.
@@ -56 +58 @@
 
         if (e_size > EBUFSIZE) {
-                pivot = (void *) malloc(e_size);
-                tmp = (void *) malloc(e_size);
-        
-                if (!tmp || !pivot) {
-                        panic("Cannot allocate memory\n");
-                }
+                pivot = (void *) malloc(e_size, 0);
+                tmp = (void *) malloc(e_size, 0);
         }
 
@@ -127 +125 @@
         
         if (e_size > EBUFSIZE) {
-                slot = (void *) malloc(e_size);
-                
-                if (!slot) {
-                        panic("Cannot allocate memory\n");
-                }
+                slot = (void *) malloc(e_size, 0);
         }