Index: /trunk/psLib/src/collections/psHash.c =================================================================== --- /trunk/psLib/src/collections/psHash.c (revision 4134) +++ /trunk/psLib/src/collections/psHash.c (revision 4135) @@ -9,9 +9,9 @@ * * @author Robert Lupton, Princeton University -* @author George Gusciora, MHPCC * @author Robert DeSonia, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-26 19:53:30 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-07 22:36:48 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -346,19 +346,7 @@ psPtr data) { - 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 (data == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_DATA_NULL); - return false; - } + PS_ASSERT_PTR_NON_NULL(table, false); + PS_ASSERT_PTR_NON_NULL(key, false); + PS_ASSERT_PTR_NON_NULL(data, false); return (doHashWork(table, key, data, false) != NULL); @@ -379,14 +367,6 @@ const char *key) // key to lookup { - if (table == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_TABLE_NULL); - return NULL; - } - if (key == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_KEY_NULL); - return NULL; - } + PS_ASSERT_PTR_NON_NULL(table, false); + PS_ASSERT_PTR_NON_NULL(key, false); return doHashWork(table, key, NULL, false); @@ -408,14 +388,6 @@ psBool retVal = false; - 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; - } + PS_ASSERT_PTR_NON_NULL(table, false); + PS_ASSERT_PTR_NON_NULL(key, false); data = doHashWork(table, key, NULL, true); @@ -431,10 +403,5 @@ psArray* psHashToArray(psHash* table) { - - if (table == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_TABLE_NULL); - return NULL; - } + PS_ASSERT_PTR_NON_NULL(table, NULL); // first, let's just count the number of data elements to know what size Index: /trunk/psLib/src/collections/psHash.h =================================================================== --- /trunk/psLib/src/collections/psHash.h (revision 4134) +++ /trunk/psLib/src/collections/psHash.h (revision 4135) @@ -1,3 +1,2 @@ - /** @file psHash.h * @brief Contains support for basic hashing functions. @@ -9,9 +8,9 @@ * * @author Robert Lupton, Princeton University - * @author George Gusciora, MHPCC * @author Robert DeSonia, MHPCC + * @author GLG, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-07 22:36:48 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,7 +28,7 @@ typedef struct psHashBucket { - char *key; ///< key for this item of data - psPtr data; ///< the data itself - struct psHashBucket* next; ///< list of other possible keys + char *key; ///< The key for this item of data. + psPtr data; ///< The data itself. + struct psHashBucket* next; ///< The list of other possible keys. } psHashBucket; @@ -52,24 +51,24 @@ /// Insert entry into table. psBool psHashAdd( - psHash* table, ///< table to insert in - const char *key, ///< key to use - psPtr data ///< data to insert + psHash* table, ///< The table to insert in. + const char *key, ///< The key to use. + psPtr data ///< The data to insert. ); /// Lookup key in table. psPtr psHashLookup( - psHash* table, ///< table to lookup key in - const char *key ///< key to lookup + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// Remove key from table. psBool psHashRemove( - psHash* table, ///< table to lookup key in - const char *key ///< key to lookup + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// List all keys in table. psList* psHashKeyList( - psHash* table ///< table to list keys from. + psHash* table ///< The table to list keys from.. ); @@ -79,5 +78,5 @@ */ psArray* psHashToArray( - psHash* table ///< table to convert to psArray + psHash* table ///< The table to convert to psArray. ); Index: /trunk/psLib/src/types/psHash.c =================================================================== --- /trunk/psLib/src/types/psHash.c (revision 4134) +++ /trunk/psLib/src/types/psHash.c (revision 4135) @@ -9,9 +9,9 @@ * * @author Robert Lupton, Princeton University -* @author George Gusciora, MHPCC * @author Robert DeSonia, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-26 19:53:30 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-07 22:36:48 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -346,19 +346,7 @@ psPtr data) { - 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 (data == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_DATA_NULL); - return false; - } + PS_ASSERT_PTR_NON_NULL(table, false); + PS_ASSERT_PTR_NON_NULL(key, false); + PS_ASSERT_PTR_NON_NULL(data, false); return (doHashWork(table, key, data, false) != NULL); @@ -379,14 +367,6 @@ const char *key) // key to lookup { - if (table == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_TABLE_NULL); - return NULL; - } - if (key == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_KEY_NULL); - return NULL; - } + PS_ASSERT_PTR_NON_NULL(table, false); + PS_ASSERT_PTR_NON_NULL(key, false); return doHashWork(table, key, NULL, false); @@ -408,14 +388,6 @@ psBool retVal = false; - 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; - } + PS_ASSERT_PTR_NON_NULL(table, false); + PS_ASSERT_PTR_NON_NULL(key, false); data = doHashWork(table, key, NULL, true); @@ -431,10 +403,5 @@ psArray* psHashToArray(psHash* table) { - - if (table == NULL) { - psError(PS_ERR_BAD_PARAMETER_NULL, true, - PS_ERRORTEXT_psHash_TABLE_NULL); - return NULL; - } + PS_ASSERT_PTR_NON_NULL(table, NULL); // first, let's just count the number of data elements to know what size Index: /trunk/psLib/src/types/psHash.h =================================================================== --- /trunk/psLib/src/types/psHash.h (revision 4134) +++ /trunk/psLib/src/types/psHash.h (revision 4135) @@ -1,3 +1,2 @@ - /** @file psHash.h * @brief Contains support for basic hashing functions. @@ -9,9 +8,9 @@ * * @author Robert Lupton, Princeton University - * @author George Gusciora, MHPCC * @author Robert DeSonia, MHPCC + * @author GLG, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-07 22:36:48 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,7 +28,7 @@ typedef struct psHashBucket { - char *key; ///< key for this item of data - psPtr data; ///< the data itself - struct psHashBucket* next; ///< list of other possible keys + char *key; ///< The key for this item of data. + psPtr data; ///< The data itself. + struct psHashBucket* next; ///< The list of other possible keys. } psHashBucket; @@ -52,24 +51,24 @@ /// Insert entry into table. psBool psHashAdd( - psHash* table, ///< table to insert in - const char *key, ///< key to use - psPtr data ///< data to insert + psHash* table, ///< The table to insert in. + const char *key, ///< The key to use. + psPtr data ///< The data to insert. ); /// Lookup key in table. psPtr psHashLookup( - psHash* table, ///< table to lookup key in - const char *key ///< key to lookup + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// Remove key from table. psBool psHashRemove( - psHash* table, ///< table to lookup key in - const char *key ///< key to lookup + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// List all keys in table. psList* psHashKeyList( - psHash* table ///< table to list keys from. + psHash* table ///< The table to list keys from.. ); @@ -79,5 +78,5 @@ */ psArray* psHashToArray( - psHash* table ///< table to convert to psArray + psHash* table ///< The table to convert to psArray. );