Fix crash in record conv rule select YAZ-812

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

diff --git a/src/nmem.c b/src/nmem.c
index 4b6d0a4..5aaa6c1 100644 (file)
--- a/src/nmem.c
+++ b/src/nmem.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
@@ -8,7 +8,7 @@
  * \brief Implements Nibble Memory
  *
  * This is a simple and fairly wasteful little module for nibble memory
- * allocation. Evemtually we'll put in something better.
+ * allocation.
  *
  */
 #if HAVE_CONFIG_H
@@ -62,11 +62,11 @@ static int log_level = 0;
 static int log_level_initialized = 0;
 
 static void free_block(struct nmem_block *p)
-{  
+{
     xfree(p->buf);
     xfree(p);
     if (log_level)
-        yaz_log (log_level, "nmem free_block p=%p", p);
+        yaz_log(log_level, "nmem free_block p=%p", p);
 }
 
 /*
@@ -78,15 +78,14 @@ static struct nmem_block *get_block(size_t size)
     size_t get = NMEM_CHUNK;
 
     if (log_level)
-        yaz_log (log_level, "nmem get_block size=%ld", (long) size);
+        yaz_log(log_level, "nmem get_block size=%ld", (long) size);
 
-    
     if (get < size)
         get = size;
-    if(log_level)
-        yaz_log (log_level, "nmem get_block alloc new block size=%ld",
-                 (long) get);
-    
+    if (log_level)
+        yaz_log(log_level, "nmem get_block alloc new block size=%ld",
+                (long) get);
+
     r = (struct nmem_block *) xmalloc(sizeof(*r));
     r->buf = (char *)xmalloc(r->size = get);
     r->top = 0;
@@ -96,8 +95,8 @@ static struct nmem_block *get_block(size_t size)
 void nmem_reset(NMEM n)
 {
     struct nmem_block *t;
-    
-    yaz_log (log_level, "nmem_reset p=%p", n);
+
+    yaz_log(log_level, "nmem_reset p=%p", n);
     if (!n)
         return;
     while (n->blocks)
@@ -116,8 +115,8 @@ void *nmem_malloc(NMEM n, size_t size)
 
     if (!n)
     {
-        yaz_log (YLOG_FATAL, "calling nmem_malloc with an null pointer");
-        abort ();
+        yaz_log(YLOG_FATAL, "calling nmem_malloc with an null pointer");
+        abort();
     }
     p = n->blocks;
     if (!p || p->size < size + p->top)
@@ -146,7 +145,7 @@ NMEM nmem_create(void)
         log_level = yaz_log_module_level("nmem");
         log_level_initialized = 1;
     }
-    
+
     r = (struct nmem_control *)xmalloc(sizeof(*r));
 
     r->blocks = 0;
@@ -160,12 +159,12 @@ void nmem_destroy(NMEM n)
 {
     if (!n)
         return;
-    
+
     nmem_reset(n);
     xfree(n);
 }
 
-void nmem_transfer (NMEM dst, NMEM src)
+void nmem_transfer(NMEM dst, NMEM src)
 {
     struct nmem_block *t;
     while ((t = src->blocks))