Skip to content
Snippets Groups Projects
Commit 29de8e36 authored by rnc's avatar rnc
Browse files

removed a load of commented out code

parent 5c847e9a
No related branches found
No related tags found
No related merge requests found
/* Last edited: Jun 30 14:32 2004 (edgrif) */ /* Last edited: Jul 5 14:37 2004 (rnc) */
/* file: stringbucket.c /* file: stringbucket.c
* Author: Simon Kelley (srk@sanger.ac.uk) * Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003 * Copyright (c) Sanger Institute, 2003
...@@ -27,19 +27,9 @@ ...@@ -27,19 +27,9 @@
#include <strings.h> #include <strings.h>
#include <glib.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> #include <stringbucket.h>
struct sbucket { struct sbucket {
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
STORE_HANDLE handle;
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
struct sbucketchain *chain; struct sbucketchain *chain;
}; };
...@@ -50,23 +40,10 @@ struct sbucketchain { ...@@ -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) 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)) ; 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; b->chain = NULL;
return b; return b;
...@@ -97,11 +74,6 @@ char *str2p(char *string, StringBucket *b) ...@@ -97,11 +74,6 @@ char *str2p(char *string, StringBucket *b)
if (!c) 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 = g_malloc(sizeof(struct sbucketchain) + strlen(string) + 1) ;
c->next = b->chain; c->next = b->chain;
......
/* Last edited: Jun 29 12:06 2004 (edgrif) */ /* Last edited: Jul 5 14:37 2004 (rnc) */
/* file: stringbucket.h /* file: stringbucket.h
* Author: Simon Kelley (srk@sanger.ac.uk) * Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003 * Copyright (c) Sanger Institute, 2003
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
*/ */
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
#include <../acedb/acedb.h>
#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
/* Stringbucket: /* Stringbucket:
Given a string returns a copy which is persistant until the Given a string returns a copy which is persistant until the
...@@ -48,9 +43,6 @@ struct sbucket; ...@@ -48,9 +43,6 @@ struct sbucket;
typedef struct sbucket StringBucket; 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) ; StringBucket *sbCreate(void) ;
void sbDestroy(StringBucket *b); void sbDestroy(StringBucket *b);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment