Changeset 560 for trunk/psLib/src/sysUtils/psHash.h

Timestamp:

May 1, 2004, 1:04:35 PM (22 years ago)

Author:

gusciora

Message:

This is a fairly large checkin. I had been sitting on a lot of test code
that was not quite in sync with the current test harness. I modified it
somewhat so it mostly works with the test harness, though there are still
problems with the printFooter() function not having a status for "status
unknown". Also, the runTest is not correctly parsing my date strings in
psLogMsg calls. Also, I added an individual entry for each test in the
Makefile in the test directory. I did this because the generic rules were
failing, and I did not want to break the tests for those people who were
successfully using the generic rules.

File:

• trunk/psLib/src/sysUtils/psHash.h (modified) (2 diffs)

trunk/psLib/src/sysUtils/psHash.h

@@ -8 +8 @@
 
 /** DO WE NEED TO DEFINE HashTable? */
-typedef struct HashTable psHash; ///< Opaque type for a hash table
+//typedef struct HashTable psHash; ///< Opaque type for a hash table
+// An entire hash table
+
+// A bucket that holds an item of data
+typedef struct psHashBucket
+{
+    char *key;                          // key for this item of data
+    void *data;                         // the data itself
+    struct psHashBucket *next;          // list of other possible keys
+}
+psHashBucket;
+
+typedef struct psHash
+{
+    int nbucket;
+    psHashBucket **buckets;
+}
+psHash;
 
 /** Functions **************************************************************/
@@ -19 +36 @@
 
 /// Free hash buckets from table.
-void psHashFree(psHash *table,  ///< hash table to be freed
+void psHashFree(psHash *table,               ///< hash table to be freed
                 void (*itemFree)(void *item) ///< how to free hashed data; or NULL
                );
 
 /// Insert entry into table.
-void *psHashInsert(psHash *table, ///< table to insert in
-                   const char *key, ///< key to use
-                   void *data,  ///< data to insert
+void *psHashInsert(psHash *table,               ///< table to insert in
+                   const char *key,             ///< key to use
+                   void *data,                  ///< data to insert
                    void (*itemFree)(void *item) ///< how to free hashed data; or NULL
                   );