X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=c0ebc9b99a7d5a488afbe9b21eb8a6a6d3bc89fc;hp=18ff8ad76d8398ab26dc8b74549b64e388f11f26;hb=a0e27aac0589d493172c73f6660b844fc6460d7c;hpb=d9ee01635f03f9095a66f71b73580560d48798e8

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 18ff8ad..c0ebc9b 100644
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1998, 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,29 +23,20 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Log: nmem.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.10  1998/10/19 15:24:20  adam
- * New nmem utility, nmem_transfer, that transfer blocks from one
- * NMEM to another.
- *
- * Revision 1.9  1998/10/13 16:00:17  adam
- * Implemented nmem_critical_{enter,leave}.
- *
- * Revision 1.8  1998/07/20 12:35:59  adam
- * Added more memory diagnostics (when NMEM_DEBUG is 1).
- *
- * Revision 1.7  1997/10/31 12:20:08  adam
- * Improved memory debugging for xmalloc/nmem.c. References to NMEM
- * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
- * Bug fix: missing fclose in data1_read_espec1.
- *
+ * $Id: nmem.h,v 1.18 2006-05-02 20:47:45 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
@@ -54,30 +45,32 @@
 #define NMEM_DEBUG 0
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+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 *);
+YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX);
+YAZ_EXPORT void nmem_mutex_leave(NMEM_MUTEX);
+YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *);
 
 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 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);
 
 YAZ_EXPORT void nmem_critical_enter (void);
@@ -92,18 +85,33 @@ YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size);
 #define nmem_destroy(x) nmem_destroy_f(__FILE__, __LINE__, (x))
 #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
 
 YAZ_EXPORT NMEM nmem_create(void);
 YAZ_EXPORT void nmem_destroy(NMEM n);
 YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
 
+#define nmem_print_list()
+
 #endif
 
 YAZ_EXPORT void nmem_init (void);
 YAZ_EXPORT void nmem_exit (void);
-#ifdef __cplusplus
-}
-#endif
+YAZ_EXPORT int yaz_errno (void);
+YAZ_EXPORT void yaz_set_errno (int v);
+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
+ */
+