diff --git a/src/zmapWindow/stringbucket.c b/src/zmapWindow/stringbucket.c index 7b5b6e8831f4341f3397acddece7fd66c5a672a4..1a41307843afea327354b3f17e2b07bfb212540c 100755 --- a/src/zmapWindow/stringbucket.c +++ b/src/zmapWindow/stringbucket.c @@ -1,4 +1,4 @@ -/* Last edited: Jun 30 14:32 2004 (edgrif) */ +/* Last edited: Jul 5 14:37 2004 (rnc) */ /* file: stringbucket.c * Author: Simon Kelley (srk@sanger.ac.uk) * Copyright (c) Sanger Institute, 2003 @@ -27,19 +27,9 @@ #include <strings.h> #include <glib.h> - -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE -#include <../acedb/regular.h> -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - #include <stringbucket.h> struct sbucket { - -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE - STORE_HANDLE handle; -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - struct sbucketchain *chain; }; @@ -50,23 +40,10 @@ struct sbucketchain { -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE -StringBucket *sbCreate(STORE_HANDLE handle) -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - StringBucket *sbCreate(void) { - -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE - StringBucket *b = halloc(sizeof(struct sbucket), handle); -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - StringBucket *b = g_malloc(sizeof(struct sbucket)) ; -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE - b->handle = handle; -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - b->chain = NULL; return b; @@ -97,11 +74,6 @@ char *str2p(char *string, StringBucket *b) if (!c) { - -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE - c = halloc(sizeof(struct sbucketchain) + strlen(string) + 1, b->handle); -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - c = g_malloc(sizeof(struct sbucketchain) + strlen(string) + 1) ; c->next = b->chain; diff --git a/src/zmapWindow/stringbucket.h b/src/zmapWindow/stringbucket.h index e74bdcbda1a477f144b428e63d6c38fa00d3b5c5..8cf06b048a08bb3e1e8889b0bd2d192f22a9b18d 100755 --- a/src/zmapWindow/stringbucket.h +++ b/src/zmapWindow/stringbucket.h @@ -1,4 +1,4 @@ -/* Last edited: Jun 29 12:06 2004 (edgrif) */ +/* Last edited: Jul 5 14:37 2004 (rnc) */ /* file: stringbucket.h * Author: Simon Kelley (srk@sanger.ac.uk) * Copyright (c) Sanger Institute, 2003 @@ -26,11 +26,6 @@ */ -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE -#include <../acedb/acedb.h> -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ - - /* Stringbucket: Given a string returns a copy which is persistant until the @@ -48,9 +43,6 @@ struct sbucket; typedef struct sbucket StringBucket; -#ifdef ED_G_NEVER_INCLUDE_THIS_CODE -StringBucket *sbCreate(STORE_HANDLE handle); -#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */ StringBucket *sbCreate(void) ; void sbDestroy(StringBucket *b);