Test universal hashing and fix bugs.

[mLib] / dstr.h

diff --git a/dstr.h b/dstr.h
index 6bc33f89dcea6fec00a938c3aa78192c7ef7ddaa..4272dd90d8c74964bdbe8ee30f0dee197260a676 100644 (file)
--- a/dstr.h
+++ b/dstr.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.10 1999/12/22 15:39:51 mdw Exp $
+ * $Id: dstr.h,v 1.12 2002/01/13 13:30:48 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.h,v $
+ * Revision 1.12  2002/01/13 13:30:48  mdw
+ * Change interface for @dstr_vputf@.
+ *
+ * Revision 1.11  2000/06/17 10:37:39  mdw
+ * Add support for arena management.
+ *
  * Revision 1.10  1999/12/22 15:39:51  mdw
  * Fix argument reuse in DPUTS.
  *
@@ -86,15 +92,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef MLIB_ALLOC_H
+#  include "alloc.h"
+#endif
+
+#ifndef MLIB_ARENA_H
+#  include "arena.h"
+#endif
+
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct dstr {
   char *buf;                           /* Pointer to string buffer */
   size_t sz;                           /* Size of the buffer */
   size_t len;                          /* Length of the string */
+  arena *a;                            /* Pointer to arena */
 } dstr;
 
-#define DSTR_INIT { 0, 0, 0 }          /* How to initialize one */
+#define DSTR_INIT { 0, 0, 0, &arena_stdlib } /* How to initialize one */
 
 /*----- Functions provided ------------------------------------------------*/
 
@@ -114,6 +129,7 @@ extern void dstr_create(dstr */*d*/);
   _dd->buf = 0;                                                                \
   _dd->sz = 0;                                                         \
   _dd->len = 0;                                                                \
+  _dd->a = &arena_stdlib;                                              \
 } while (0)
 
 /* --- @dstr_destroy@ --- *
@@ -130,7 +146,7 @@ extern void dstr_destroy(dstr */*d*/);
 #define DDESTROY(d) do {                                               \
   dstr *_d = (d);                                                      \
   if (_d->buf)                                                         \
-    free(_d->buf);                                                     \
+    x_free(_d->a, _d->buf);                                            \
   DCREATE(_d);                                                         \
 } while (0)
 
@@ -229,7 +245,7 @@ extern void dstr_puts(dstr */*d*/, const char */*s*/);
  *
  * Arguments:  @dstr *d@ = pointer to a dynamic string block
  *             @const char *p@ = pointer to @printf@-style format string
- *             @va_list ap@ = argument handle
+ *             @va_list *ap@ = argument handle
  *
  * Returns:    The number of characters written to the string.
  *
@@ -237,7 +253,7 @@ extern void dstr_puts(dstr */*d*/, const char */*s*/);
  *             supplied functions with @printf@-style interfaces.
  */
 
-extern int dstr_vputf(dstr */*d*/, const char */*p*/, va_list /*ap*/);
+extern int dstr_vputf(dstr */*d*/, const char */*p*/, va_list */*ap*/);
 
 /* --- @dstr_putf@ --- *
  *