hashtable fix

1 files changed, 15 insertions, 22 deletions

diff --git a/ecp/src/htable/hashtable_private.h b/ecp/src/htable/hashtable_private.h
index 2330b00..bdddfc7 100755
--- a/ecp/src/htable/hashtable_private.h
+++ b/ecp/src/htable/hashtable_private.h
@@ -5,27 +5,13 @@
 
 #include "hashtable.h"
 
-/*****************************************************************************/
-struct entry
-{
-    void *k, *v;
-    unsigned int h;
-    struct entry *next;
-};
-
 struct hashtable {
     unsigned int tablelength;
     struct entry **table;
     unsigned int entrycount;
     unsigned int loadlimit;
-    unsigned int primeindex;
-    unsigned int (*fn_hash) (void *k);
-    int (*fn_eq) (void *k1, void *k2);
-    void *(*fn_malloc) (size_t);
-    void *(*fn_realloc) (void *,size_t);
-    void (*fn_free) (void *);
-    void (*fn_free_k) (void *);
-    void (*fn_free_v) (void *);
+    unsigned int (*hashfn) (void *k);
+    int (*eqfn) (void *k1, void *k2);
 };
 
 /*****************************************************************************/
@@ -48,28 +34,35 @@ indexFor(unsigned int tablelength, unsigned int hashvalue)
 }
 */
 
+/*****************************************************************************/
+/* #define freekey(X) free(X) */
+#define freekey(X) ;
+
+
+/*****************************************************************************/
+
 #endif /* __HASHTABLE_PRIVATE_CWC22_H__*/
 
 /*
  * Copyright (c) 2002, Christopher Clark
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
- * 
+ *
  * * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * 
+ *
  * * Neither the name of the original author; nor the names of any contributors
  * may be used to endorse or promote products derived from this software
  * without specific prior written permission.
- * 
- * 
+ *
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR