Changeset 390

Timestamp:

Apr 2, 2004, 4:36:53 AM (22 years ago)

Author:

rhl

Message:

Fixed calls to psError

Location:

trunk/archive/pslib/src/Utils

Files:

• dlist.c (modified) (2 diffs)
• tst_memory.c (modified) (5 diffs)
• tst_trace.c (modified) (1 diff)

trunk/archive/pslib/src/Utils/dlist.c

@@ -187 +187 @@
         
         if (which < 0 || which >= list->n) { // out of bounds
-            psError(__func__, "Index %d is not in range [0..%d] for list 0x%x", which, list->n, list);
+            psError(__func__, PS_ERR_BAD_INDEX, 1, "Index %d is not in range [0..%d] for list 0x%x", which, list->n, list);
             return NULL;
         }
@@ -281 +281 @@
 {
     if (where != PS_DLIST_HEAD && where != PS_DLIST_TAIL) {
-        psError(__func__, "Invalid where argument: %d; assuming PS_DLIST_HEAD", where);
+        psError(__func__, PS_ERR_UNKNOWN, 1, "Invalid where argument: %d; assuming PS_DLIST_HEAD", where);
         where = PS_DLIST_HEAD;
     }

trunk/archive/pslib/src/Utils/tst_memory.c

@@ -25 +25 @@
 static void *my_MemExhaustedCB(size_t size)
 {
-    psError(__func__, "Bye bye sweet world\n");
+    psError(__func__, ENOMEM, 1, "Bye bye sweet world\n");
     
     return NULL;
@@ -74 +74 @@
     str = psRealloc(str, 20);
     psFree(str);
-#if 1
+#if 0
     /*
      * An illegal double-free
@@ -81 +81 @@
 #endif
 
-#if 1
+#if 0
     /*
      * Free memory not allocated with psAlloc
@@ -88 +88 @@
 #endif
 
-#if 0
+#if 1
     /*
      * Ask for more memory than we can get
@@ -137 +137 @@
      */
     if(psMemCheckCorruption(1)) {
-        psError(__func__, "Detected corrupted memory\n\n");
+        psError(__func__, PS_ERR_MEMORY_CORRUPTION, 1, "Detected corrupted memory\n\n");
     }
     /*

trunk/archive/pslib/src/Utils/tst_trace.c

@@ -13 +13 @@
     
     if(psMemCheckCorruption(0)) {
-        psError(__func__, "Detected corrupted memory\n\n");
+        psError(__func__, PS_ERR_MEMORY_CORRUPTION, PS_NEW_ERROR, "Detected corrupted memory\n");
     }