Changeset 2621

Timestamp:

Dec 3, 2004, 2:04:33 PM (22 years ago)

Author:

evanalst

Message:

Updated error messages and return values for psHashAdd.

Location:

trunk/psLib/src

Files:

• collections/psHash.c (modified) (4 diffs)
• types/psHash.c (modified) (4 diffs)

trunk/psLib/src/collections/psHash.c

@@ -11 +11 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-04 01:04:57 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-04 00:04:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -332 +332 @@
 
 /******************************************************************************
-psHashInsert(table, key, data, itemFree): this procedure, which is part of
+psHashAdd(table, key, data): this procedure, which is part of
 the public API, inserts a new key/data pair into the hash table.
 Inputs:
@@ -338 +338 @@
     key: the key to use
     data: the data to insert.
-    itemFree: a function pointer
 Return:
     boolean value defining success or failure
@@ -348 +347 @@
     if (table == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_TABLE_NULL);
+        return false;
+    }
+    if (key == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psHash_KEY_NULL);
         return false;
     }
-    if (key == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
+    if (data == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_DATA_NULL);
         return false;
-    }
-    if (data == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_DATA_NULL);
     }
 

trunk/psLib/src/types/psHash.c

@@ -11 +11 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-04 01:04:57 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-04 00:04:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -332 +332 @@
 
 /******************************************************************************
-psHashInsert(table, key, data, itemFree): this procedure, which is part of
+psHashAdd(table, key, data): this procedure, which is part of
 the public API, inserts a new key/data pair into the hash table.
 Inputs:
@@ -338 +338 @@
     key: the key to use
     data: the data to insert.
-    itemFree: a function pointer
 Return:
     boolean value defining success or failure
@@ -348 +347 @@
     if (table == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_TABLE_NULL);
+        return false;
+    }
+    if (key == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psHash_KEY_NULL);
         return false;
     }
-    if (key == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_TABLE_NULL);
+    if (data == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_DATA_NULL);
         return false;
-    }
-    if (data == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psHash_DATA_NULL);
     }