X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=2f8fb6feebff009214672002bda47e0443fe46d8;hb=fd3a0b7302ceed6425c05b6537cb654201cb1494;hp=6c92e994fa8bfbc7d553158799ecb431a998888d;hpb=4c176312acdc3444c9afc820f76a393e64668e52;p=yaz-moved-to-github.git

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 6c92e99..2f8fb6f 100644
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: nmem.h,v 1.14 2005-01-15 19:47:09 adam Exp $
+ * $Id: nmem.h,v 1.19 2006-05-03 13:04:46 adam Exp $
  */
 
 /**
@@ -35,6 +35,8 @@
  */
 #ifndef NMEM_H
 #define NMEM_H
+
+#include <stddef.h>
 #include <yaz/yconfig.h>
 
 #define NMEM_DEBUG 0
@@ -45,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 *);
@@ -71,7 +62,15 @@ 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_strdup_null (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 char *nmem_text_node_cdata(const void *ptr_cdata, NMEM nmem);
+
 YAZ_EXPORT int *nmem_intdup (NMEM mem, int v);
 YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src);
 
@@ -109,3 +108,11 @@ YAZ_EXPORT void yaz_strerror(char *buf, int max);
 YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+