Changeset 9143 for trunk/psLib/src/types

Timestamp:

Oct 2, 2006, 8:51:47 PM (20 years ago)

Author:

drobbin

Message:

Made several changes. Finished bitSet testing, list testing. Minor changes to psList.c. Added lookupTable test to Makefile. minor changes to LookupTable.c

Location:

trunk/psLib/src/types

Files:

• psList.c (modified) (3 diffs)
• psLookupTable.c (modified) (4 diffs)

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-02 06:05:53 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-03 06:51:47 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -574 +574 @@
     }
 
-    if (list->n > 0) {
-        arr = psArrayAlloc(list->n);
-    } else {
-        arr = psArrayAlloc(1);
-    }
-
+    //XXX: Following is unnecessary as a list->n = 0 should do ArrayAlloc(0) I believe.
+    /*    if (list->n > 0) {
+            arr = psArrayAlloc(list->n);
+        } else {
+            arr = psArrayAlloc(1);
+        }
+    */
+    arr = psArrayAlloc(list->n);
     arr->n = list->n;
 
@@ -618 +620 @@
         return NULL;
     }
+    if (func == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                _("Specified psComparePtrFunc is NULL."));
+        return list;
+    }
     // convert to indexable vector for use by qsort.
     arr = psListToArray(list);

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-26 04:34:28 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-03 06:51:47 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -253 +253 @@
 static void lookupTableFree(psLookupTable* table)
 {
-    if (table == NULL) {
-        return;
-    }
-
     psFree(table->values);
     psFree(table->filename);
@@ -279 +275 @@
                                   long indexCol)
 {
-    psLookupTable *outTable = NULL;
-
     // Can't read table if you don't know its name
     PS_ASSERT_PTR_NON_NULL(filename,NULL);
@@ -286 +280 @@
     // Can't read table if you don't know its format
     PS_ASSERT_PTR_NON_NULL(format,NULL);
+
+    psLookupTable *outTable = NULL;
 
     // Allocate lookup table