Minor changes.

[yaz-moved-to-github.git] / util / nmem.c

diff --git a/util/nmem.c b/util/nmem.c
index 61fe862..a9646fb 100644 (file)
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: nmem.c,v $
- * Revision 1.18  1999-08-27 09:40:32  adam
+ * Revision 1.22  2000-05-03 22:00:00  adam
+ * Reference counter (if multiple modules are init/freeing nmem).
+ *
+ * Revision 1.21  2000/02/29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.20  2000/01/06 14:59:13  adam
+ * Added oid_init/oid_exit. Changed oid_exit.
+ *
+ * Revision 1.19  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.18  1999/08/27 09:40:32  adam
  * Renamed logf function to yaz_log. Removed VC++ project files.
  *
  * Revision 1.17  1999/07/13 13:28:25  adam
@@ -71,12 +83,15 @@
  * This is a simple and fairly wasteful little module for nibble memory
  * allocation. Evemtually we'll put in something better.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
-#include <xmalloc.h>
-#include <nmem.h>
-#include <log.h>
+#include <yaz/xmalloc.h>
+#include <yaz/nmem.h>
+#include <yaz/log.h>
 #ifdef WIN32
 #include <windows.h>
 #elif _REENTRANT
@@ -358,32 +373,37 @@ void nmem_critical_leave (void)
 
 void nmem_init (void)
 {
-    nmem_init_flag = 1;
+    if (++nmem_init_flag == 1)
+    {
 #ifdef WIN32
-    InitializeCriticalSection(&critical_section);
+       InitializeCriticalSection(&critical_section);
 #endif
-    nmem_active_no = 0;
-    freelist = NULL;
-    cfreelist = NULL;
+       nmem_active_no = 0;
+       freelist = NULL;
+       cfreelist = NULL;
+    }
 }
 
 void nmem_exit (void)
 {
-    while (freelist)
-    {
-       struct nmem_block *fl = freelist;
-       freelist = freelist->next;
-       xfree (fl->buf);
-       xfree (fl);
-    }
-    while (cfreelist)
+    if (--nmem_init_flag == 0)
     {
-       struct nmem_control *cfl = cfreelist;
-       cfreelist = cfreelist->next;
-       xfree (cfl);
-    }
+       while (freelist)
+       {
+           struct nmem_block *fl = freelist;
+           freelist = freelist->next;
+           xfree (fl->buf);
+           xfree (fl);
+       }
+       while (cfreelist)
+       {
+           struct nmem_control *cfl = cfreelist;
+           cfreelist = cfreelist->next;
+           xfree (cfl);
+       }
 #ifdef WIN32
-    DeleteCriticalSection(&critical_section);
+       DeleteCriticalSection(&critical_section);
 #endif
+    }
 }