New nmem utility, nmem_transfer, that transfer blocks from one

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

diff --git a/util/wrbuf.c b/util/wrbuf.c
index 446b6d5..c948dc1 100644 (file)
--- a/util/wrbuf.c
+++ b/util/wrbuf.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: wrbuf.c,v $
- * Revision 1.1  1995-10-06 08:51:25  quinn
+ * Revision 1.4  1998-02-11 11:53:36  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.3  1997/05/01 15:08:15  adam
+ * Added log_mask_str_x routine.
+ *
+ * Revision 1.2  1995/11/01 13:55:06  quinn
+ * Minor adjustments
+ *
+ * Revision 1.1  1995/10/06  08:51:25  quinn
  * Added Write-buffer.
  *
  *
@@ -15,6 +24,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <wrbuf.h>
 
@@ -22,7 +32,7 @@ WRBUF wrbuf_alloc(void)
 {
     WRBUF n;
 
-    if (!(n = malloc(sizeof(*n))))
+    if (!(n = (WRBUF)xmalloc(sizeof(*n))))
        abort();
     n->buf = 0;
     n->size = 0;
@@ -33,8 +43,8 @@ WRBUF wrbuf_alloc(void)
 void wrbuf_free(WRBUF b, int free_buf)
 {
     if (free_buf && b->buf)
-       free(b->buf);
-    free(b);
+       xfree(b->buf);
+    xfree(b);
 }
 
 void wrbuf_rewind(WRBUF b)
@@ -52,9 +62,9 @@ int wrbuf_grow(WRBUF b, int minsize)
        togrow = b->size;
     if (togrow < minsize)
        togrow = minsize;
-    if (b->size && !(b->buf = realloc(b->buf, b->size += togrow)))
+    if (b->size && !(b->buf =(char *)xrealloc(b->buf, b->size += togrow)))
        abort();
-    else if (!b->size && !(b->buf = malloc(b->size = togrow)))
+    else if (!b->size && !(b->buf = (char *)xmalloc(b->size = togrow)))
        abort();
     return 0;
 }