pegc: Check-in [7240dfdba1]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:	7240dfdba152b1e6acdd7191a313b013a4801db5
Date:	2008-11-04 19:46:57
User:	stephan
Comment:	removed whhash_sh_xxx() API.

Tags And Properties

branch=trunk inherited from [a870fea998]
sym-trunk inherited from [a870fea998]

Changes

hide diffs unified diffs patch

Changes to src/whhash.c

--- Old (803862366eb1b033)
+++ New (093eb3ad84431bd0)
 /* Copyright (C) 2004 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */
 /* Copyright (C) 2008 Stephan Beal (http://wanderinghorse.net/home/stephan/) */
 #include "whhash.h"
 #include <stdlib.h>
         parent = e;
         e = e->next;
+    }
     return 0;
+}
@@ 825 / < @@
-whhash_table * whhash_sh_create()
-{
-    whhash_table * h = whhash_create(16,
-				     whhash_hash_cstring_djb2m,
-				     whhash_cmp_cstring );
-    h->flags |= whhash_flags.SH_API;
-    return h;
-}
-/**
-   WHHASH_SH ensures that whhash_table H is compatible with
-   whhash_sh_create()'s table. If it's not then return RV is called.
-*/
-#define WHHASH_SH(H,RV) if( !h || !(h->flags & whhash_flags.SH_API) ) return RV;
@@ 839 / < @@
-int whhash_sh_insert(whhash_table * h, char const * key, void * val)
-{
-    WHHASH_SH(h,0);
-    // FIXME: we need to copy this string and see free() to the dtor!
-    return whhash_insert(h,(char *) key, val);
-    /**
-       i don't like that (char*) cast at all :(
-     */
-}
@@ 849 / < @@
-void * whhash_sh_search(whhash_table * h, char const * key)
-{
-    WHHASH_SH(h,0);
-    return whhash_search( h, key );
-}
-void * whhash_sh_take(whhash_table * h, char const * key)
-{
-    WHHASH_SH(h,0);
-    return whhash_take( h, (char *)key );
-}
-int whhash_sh_remove(whhash_table * h, char const * key)
-{
-    WHHASH_SH(h,0);
-    return whhash_remove( h, (char *)key );
-}
@@ 865 / < @@
-#undef WHHASH_SH
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

Changes to src/whhash.h

--- Old (11a780b3eb4023be)
+++ New (b966a1a75384615d)
 /* Copyright (C) 2002 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */
 /* Copyright (C) 2008 Stephan Beal (http://wanderinghorse.net/home/stephan/) */
 /* Code originally taken from: http://www.cl.cam.ac.uk/~cwc22/hashtable/ */
 #ifndef WANDERINGHORSE_NET_WHHASH_H_INCLUDED
 #define WANDERINGHORSE_NET_WHHASH_H_INCLUDED
 /**
    Returns the current statistics for h, or an object
    with all 0 values if (!h).
 */
 whhash_stats whhash_get_stats( whhash_table const * h );
@@ 606 / < @@
-/**
-   Creates a new hashtable which is specialized for use with
-   (char const *) keys. It is not intended to own the keys,
-   and due to constness rules results are undefined if you
-   set a destructor for the keys.
@@ 612 / < @@
-   The other functions in this API named whhash_sh_something()
-   are intended only to be used with hashes created by this function,
-   and in fact check their hashtable argument to see if it was created
-   by this function. If a hashtable created using whhash_create() is
-   passed to them, they will return an error result (e.g. a null pointer
-   or a false value).
-*/
-whhash_table * whhash_sh_create();
@@ 621 / < @@
-/**
-   Functionally identical to whhash_insert(), but only works with hashtables
-   created by whhash_sh_create().
- */
-int whhash_sh_insert(whhash_table *h, char const * key, void * val);
@@ 627 / < @@
-/**
-   Functionally identical to whhash_search(), but only works with hashtables
-   created by whhash_sh_create().
- */
-void * whhash_sh_search(whhash_table *h, char const * key);
@@ 633 / < @@
-/**
-   Functionally identical to whhash_take(), but only works with hashtables
-   created by whhash_sh_create().
- */
-void * whhash_sh_take(whhash_table *h, char const * key);
@@ 639 / < @@
-/**
-   Functionally identical to whhash_remove(), but only works with hashtables
-   created by whhash_sh_create().
- */
-int whhash_sh_remove(whhash_table *h, char const * key);
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
 #endif /* WANDERINGHORSE_NET_WHHASH_H_INCLUDED */
  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */