X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=b424be0687b729a738b8f474ea55ea92f236dce7;hb=a97174e3c213916ba968c8922ec69e9101badb2d;hp=1a0a260021dbf1dc337467b7abf457e4689ed951;hpb=79b486cea07c6352407a289d3b4b9a8545b470e6;p=yaz-moved-to-github.git

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 1a0a260..b424be0 100644
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2002, Index Data.
+ * Copyright (C) 1995-2005, Index Data ApS
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,11 +23,20 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: nmem.h,v 1.9 2002-12-05 12:19:23 adam Exp $
+ * $Id: nmem.h,v 1.16 2005-06-03 20:30:30 adam Exp $
  */
 
+/**
+ * \file nmem.h
+ * \brief Header for Nibble Memory functions
+ *
+ * This is a simple and fairly wasteful little module for nibble memory
+ * allocation. Evemtually we'll put in something better.
+ */
 #ifndef NMEM_H
 #define NMEM_H
+
+#include <stddef.h>
 #include <yaz/yconfig.h>
 
 #define NMEM_DEBUG 0
@@ -38,20 +47,9 @@
 
 YAZ_BEGIN_CDECL
 
-typedef struct nmem_block
-{
-    char *buf;              /* memory allocated in this block */
-    int size;               /* size of buf */
-    int top;                /* top of buffer */
-    struct nmem_block *next;
-} nmem_block;
-
-typedef struct nmem_control
-{
-    int total;
-    nmem_block *blocks;
-    struct nmem_control *next;
-} nmem_control;
+typedef struct nmem_block nmem_block;
+
+typedef struct nmem_control nmem_control;
 
 typedef struct nmem_mutex *NMEM_MUTEX;
 YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *);
@@ -64,6 +62,13 @@ typedef struct nmem_control *NMEM;
 YAZ_EXPORT void nmem_reset(NMEM n);
 YAZ_EXPORT int nmem_total(NMEM n);
 YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src);
+YAZ_EXPORT char *nmem_strdupn (NMEM mem, const char *src, size_t n);
+YAZ_EXPORT void nmem_strsplit_blank(NMEM nmem, const char *dstr,
+				    char ***darray, int *num);
+YAZ_EXPORT void nmem_strsplit(NMEM nmem, const char *delim,
+			      const char *dstr,
+			      char ***darray, int *num);
+
 YAZ_EXPORT int *nmem_intdup (NMEM mem, int v);
 YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src);
 
@@ -80,6 +85,7 @@ YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size);
 #define nmem_malloc(x, y) nmem_malloc_f(__FILE__, __LINE__, (x), (y))
 
 YAZ_EXPORT void nmem_print_list (void);
+YAZ_EXPORT void nmem_print_list_l (int level);
 
 #else