X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=6bffb6a052f5554e1c76550e85438c4589b35ae8;hb=9c75e92604fae1efd7137d085dd2281e7886345b;hp=2666fe7b2fd43e72836bb05d651b744da40dfa9a;hpb=964580242e2e0b2e570f652afa58bfb90ad0bb5e;p=yaz-moved-to-github.git

diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h
index 2666fe7..6bffb6a 100644
--- a/include/yaz/nmem.h
+++ b/include/yaz/nmem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2006, Index Data
+ * Copyright (c) 1995-2007, Index Data
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: nmem.h,v 1.22 2006-10-09 21:02:41 adam Exp $ */
+/* $Id: nmem.h,v 1.25 2007-04-17 20:26:18 adam Exp $ */
 
 /**
  * \file nmem.h
@@ -39,29 +39,8 @@
 #include <stddef.h>
 #include <yaz/yconfig.h>
 
-#if YAZ_HAVE_XML2
-#include <libxml/parser.h>
-#endif
-
-#define NMEM_DEBUG 0
-
-#ifndef NMEM_DEBUG
-#define NMEM_DEBUG 0
-#endif
-
 YAZ_BEGIN_CDECL
 
-/** \brief NMEM/YAZ MUTEX opaque pointer */
-typedef struct nmem_mutex *NMEM_MUTEX;
-/** \brief create Mutex */
-YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *);
-/** \brief enter critical section / AKA lock */
-YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX);
-/** \brief leave critical section / AKA unlock */
-YAZ_EXPORT void nmem_mutex_leave(NMEM_MUTEX);
-/** \brief destroy MUTEX */
-YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *);
-
 /** \brief NMEM handle (an opaque pointer to memory) */
 typedef struct nmem_control *NMEM;
 
@@ -97,36 +76,12 @@ YAZ_EXPORT void nmem_strsplit(NMEM nmem, const char *delim,
 YAZ_EXPORT void nmem_strsplit_blank(NMEM nmem, const char *dstr,
                                     char ***darray, int *num);
 
-#if YAZ_HAVE_XML2
-/** \brief copies TEXT Libxml2 node data to NMEM */
-YAZ_EXPORT char *nmem_text_node_cdata(const xmlNode *ptr, NMEM nmem);
-#endif
-
 /** \brief creates and allocates integer for NMEM */
 YAZ_EXPORT int *nmem_intdup (NMEM mem, int v);
 
 /** \brief transfers memory from one NMEM handle to another  */
 YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src);
 
-/** \brief internal (do not use) */
-YAZ_EXPORT void nmem_critical_enter (void);
-/** \brief internal (do not use) */
-YAZ_EXPORT void nmem_critical_leave (void);
-
-#if NMEM_DEBUG
-
-YAZ_EXPORT NMEM nmem_create_f(const char *file, int line);
-YAZ_EXPORT void nmem_destroy_f(const char *file, int line, NMEM n);
-YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size);
-#define nmem_create() nmem_create_f(__FILE__, __LINE__)
-#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
-
 /** \brief returns new NMEM handle */
 YAZ_EXPORT NMEM nmem_create(void);
 
@@ -136,32 +91,10 @@ YAZ_EXPORT void nmem_destroy(NMEM n);
 /** \brief allocate memory block on NMEM handle */
 YAZ_EXPORT void *nmem_malloc(NMEM n, int size);
 
-#define nmem_print_list()
-
-#endif
-
-/** \brief initializes NMEM system
-    This function increments a usage counter for NMEM.. Only
-    on first usage the system is initialized.. The \fn nmem_exit
-    decrements the counter. So these must be called in pairs
-*/
-YAZ_EXPORT void nmem_init (void);
-
-/** \brief destroys NMEM system */
-YAZ_EXPORT void nmem_exit (void);
-
 YAZ_EXPORT int yaz_errno (void);
 YAZ_EXPORT void yaz_set_errno (int v);
 YAZ_EXPORT void yaz_strerror(char *buf, int max);
 
-/** \brief returns memory in use (by application) 
-    \param p pointer to size (in bytes)
- */
-YAZ_EXPORT void nmem_get_memory_in_use(size_t *p);
-/** \brief returns memory in free (for later reuse) 
- */
-YAZ_EXPORT void nmem_get_memory_free(size_t *p);
-
 YAZ_END_CDECL
 
 #endif