Changeset 2699

Timestamp:

Dec 10, 2004, 3:24:15 PM (22 years ago)

Author:

desonia

Message:

fixed errorneous warning in psListAdd.

Location:

trunk/psLib

Files:

• src/collections/psList.c (modified) (2 diffs)
• src/types/psList.c (modified) (2 diffs)
• test/collections/tst_psList.c (modified) (1 diff)
• test/collections/verified/tst_psList.stderr (modified) (4 diffs)

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-11 01:19:06 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-11 01:24:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -257 +257 @@
     }
 
-    if (location >= (int)list->size) {
+    if (location > 0 && location >= (int)list->size) {
         psLogMsg(__func__,PS_LOG_WARN,
                  "Specified location, %d, is beyond the end of the list.  "

trunk/psLib/src/types/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-11 01:19:06 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-11 01:24:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -257 +257 @@
     }
 
-    if (location >= (int)list->size) {
+    if (location > 0 && location >= (int)list->size) {
         psLogMsg(__func__,PS_LOG_WARN,
                  "Specified location, %d, is beyond the end of the list.  "

trunk/psLib/test/collections/tst_psList.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-11 01:19:06 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-11 01:24:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/test/collections/verified/tst_psList.stderr

@@ -18 +18 @@
 <DATE><TIME>|<HOST>|I|testListAdd
     psListAdd shall add an element to list
+<DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
+    Specified psList reference is NULL. 
+<DATE><TIME>|<HOST>|E|psListAdd (psList.c:<LINENO>)
+    Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should error with invalid insert location
-<DATE><TIME>|<HOST>|W|psListAdd
-    The given insert location (-10) for psListAdd is invalid.
+<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+    Specified location, -10, is invalid.
 <DATE><TIME>|<HOST>|I|testListAdd
     Following should be a warning.
 <DATE><TIME>|<HOST>|W|psListAdd
-    Invalid index 9 (only 6 elements in psList); assuming tail.
+    Specified location, 9, is beyond the end of the list.  Adding data item to tail.
 
 ---> TESTPOINT PASSED (psList{psListAdd} | tst_psList.c)
@@ -37 +41 @@
 <DATE><TIME>|<HOST>|I|testListGet
     Following should be an error
-<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
-    Unexpected null pointer for psList parameter.
+<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+    Specified psList reference is NULL. 
+<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+    Specified location, 5, is invalid.
+<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+    Specified location, 5, is invalid.
+<DATE><TIME>|<HOST>|E|psListIteratorSet (psList.c:<LINENO>)
+    Specified location, 4, is invalid.
+<DATE><TIME>|<HOST>|E|psListGet (psList.c:<LINENO>)
+    Specified location, 4, is invalid.
 
 ---> TESTPOINT PASSED (psList{psListGet} | tst_psList.c)
@@ -51 +63 @@
     Following should be an error
 <DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
-    list parameter found to be NULL.
+    Specified psList reference is NULL. 
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
-    Couldn't position to given index (-4) to remove element from list.
+<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+    Specified data item is NULL.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
-    Couldn't position to given index (-2) to remove element from list.
-<DATE><TIME>|<HOST>|I|testListRemove
-    Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
-    Failed to find item in given psList.
-<DATE><TIME>|<HOST>|I|testListRemove
-    Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
-    Failed to find item in given psList.
+<DATE><TIME>|<HOST>|E|psListRemoveData (psList.c:<LINENO>)
+    Specified data item is not found in the psList.
 
 ---> TESTPOINT PASSED (psList{psListRemove} | tst_psList.c)
@@ -90 +94 @@
 <DATE><TIME>|<HOST>|I|testListIterator
     Following should error with 'Unexpected null pointer'
-<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
-    Unexpected null pointer for psList parameter.
-<DATE><TIME>|<HOST>|I|testListIterator
-    Following should error with 'Can't move to an unknown position.'
-<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
-    Can't move to an unknown position.  Not moving the iterator position.
 
 ---> TESTPOINT PASSED (psList{psListIterator} | tst_psList.c)