Changeset 11709

Timestamp:

Feb 8, 2007, 11:44:00 AM (19 years ago)

Author:

jhoblitt

Message:

change psHashAlloc() to pass in file/lineno/func
whitespace fixes

Location:

trunk/psLib/src/types

Files:

• psHash.c (modified) (4 diffs)
• psHash.h (modified) (8 diffs)

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-06 21:36:09 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-08 21:44:00 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -137 +137 @@
     The new hash table.
  *****************************************************************************/
-psHash* psHashAlloc(long nalloc)        // initial number of buckets
+psHash* p_psHashAlloc(const char *file,
+                      unsigned int lineno,
+                      const char *func,
+                      long nalloc)        // initial number of buckets
 {
     if (nalloc < 0)
@@ -148 +151 @@
 
     // Create the new hash table.
-    psHash* table = psAlloc(sizeof(psHash));
+    psHash* table = p_psAlloc(file, lineno, func, sizeof(psHash));
 
     psMemSetDeallocator(table, (psFreeFunc) hashFree);
@@ -167 +170 @@
     return table;
 }
+
 
 bool psMemCheckHash(psPtr ptr)

trunk/psLib/src/types/psHash.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-08 21:44:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 psHashBucket;
 
+
 //typedef struct HashTable psHash; ///< Opaque type for a hash table
 
@@ -45 +46 @@
 psHash;
 
+
 /** Checks the type of a particular pointer.
  *
- *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr
+ *  datatype.
  *
  *  @return bool:       True if the pointer matches a psHash structure, false otherwise.
@@ -53 +56 @@
 bool psMemCheckHash(
     psPtr ptr                          ///< the pointer whose type to check
-)
-;
+);
+
 
 /// Allocate hash buckets in table.
+#ifdef DOXYGEN
 psHash* psHashAlloc(
     long nalloc                        ///< The number of buckets to allocate.
 );
+#else // ifdef DOXYGEN
+psHash* p_psHashAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    long nalloc                        ///< The number of buckets to allocate.
+);
+#define psHashAlloc(nalloc) \
+      p_psHashAlloc(__FILE__, __LINE__, __func__, nalloc)
+#endif // ifdef DOXYGEN
+
+
 
 /// Insert entry into table.
@@ -68 +84 @@
 );
 
+
 /// Lookup key in table.
 psPtr psHashLookup(
@@ -73 +90 @@
     const char *key                    ///< The key to lookup.
 );
+
 
 /// Remove key from table.
@@ -80 +98 @@
 );
 
+
 /// List all keys in table.
 psList* psHashKeyList(
     const psHash* hash                 ///< The table to list keys from..
 );
+
 
 /** Create a psArray from a psHash contents.
@@ -93 +113 @@
 );
 
+
 /// @} End of DataContainer Functions
 #endif // #ifndef PS_HASH_H