Qualify name given to @bres_byname@.

[mLib] / dstr.c

diff --git a/dstr.c b/dstr.c
index 7c03a3c5496346e77d92cce48bfbfb9065d4b04e..273c53acebe51229361e11d22d23f872986392d3 100644 (file)
--- a/dstr.c
+++ b/dstr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.c,v 1.11 1999/10/28 22:05:29 mdw Exp $
+ * $Id: dstr.c,v 1.15 2000/07/16 12:29:16 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,18 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.c,v $
+ * Revision 1.15  2000/07/16 12:29:16  mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
+ * Revision 1.14  2000/06/17 10:37:39  mdw
+ * Add support for arena management.
+ *
+ * Revision 1.13  1999/12/22 15:39:28  mdw
+ * Fix overflow in dstr_putline.
+ *
+ * Revision 1.12  1999/12/10 23:42:04  mdw
+ * Change header file guard names.
+ *
  * Revision 1.11  1999/10/28 22:05:29  mdw
  * Modify and debug allocation routines.
  *
@@ -111,7 +123,7 @@ void dstr_destroy(dstr *d) { DDESTROY(d); }
 
 /* --- @dstr_reset@ --- *
  *
- * Arguments:  @dstr *d@ = pointer to a dynaimc string block
+ * Arguments:  @dstr *d@ = pointer to a dynamic string block
  *
  * Returns:    ---
  *
@@ -150,9 +162,9 @@ void dstr_ensure(dstr *d, size_t sz)
   do nsz <<= 1; while (nsz < rq);
 
   if (d->buf)
-    d->buf = xrealloc(d->buf, nsz);
+    d->buf = x_realloc(d->a, d->buf, nsz, d->sz);
   else
-    d->buf = xmalloc(nsz);
+    d->buf = x_alloc(d->a, nsz);
   d->sz = nsz;
 }
 
@@ -231,7 +243,7 @@ void dstr_putm(dstr *d, const void *p, size_t sz) { DPUTM(d, p, sz); }
 
 void dstr_tidy(dstr *d)
 {
-  d->buf = xrealloc(d->buf, d->len + 1);
+  d->buf = x_realloc(d->a, d->buf, d->len + 1, d->sz);
   d->buf[d->len] = 0;
   d->sz = d->len + 1;
 }
@@ -270,6 +282,7 @@ int dstr_putline(dstr *d, FILE *fp)
     /* --- Make sure there's some buffer space --- */
 
     if (!left) {
+      d->len = off;
       dstr_ensure(d, 1);
       left = d->sz - off;
     }