Commit as 2.1.0.

[mLib] / dstr.h

diff --git a/dstr.h b/dstr.h
index cde6b6f3f2a2301c7365b2fb69c49b4ae4ceeafa..019758a198222e481efd312e1dab2be00e8909cc 100644 (file)
--- a/dstr.h
+++ b/dstr.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.9 1999/12/10 23:42:04 mdw Exp $
+ * $Id: dstr.h,v 1.13 2004/04/08 01:36:11 mdw Exp $
  *
  * Handle dynamically growing strings
  *
  * (c) 1998 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,51 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: dstr.h,v $
- * Revision 1.9  1999/12/10 23:42:04  mdw
- * Change header file guard names.
- *
- * Revision 1.8  1999/07/14 19:45:24  mdw
- * Prevent some macros from re-evaluating their arguments.
- *
- * Revision 1.7  1999/05/21 22:12:12  mdw
- * Fix the bugs in the new macros.  (Whoops.)
- *
- * Revision 1.6  1999/05/21 08:38:14  mdw
- * Add some more macros, particularly for creation and destruction.
- *
- * Revision 1.5  1999/05/13 22:47:57  mdw
- * Misc documentation fixes.  Change `-ise' to `-ize' throughout.
- *
- * Revision 1.4  1999/05/06 19:51:35  mdw
- * Reformatted the LGPL notice a little bit.
- *
- * Revision 1.3  1999/05/05 18:50:31  mdw
- * Change licensing conditions to LGPL.
- *
- * Revision 1.2  1998/12/15 23:53:23  mdw
- * New functions `dstr_putf' and `dstr_vputf' which do `printf'-style
- * formatting in a safe way.
- *
- * Revision 1.1.1.1  1998/06/17 23:44:42  mdw
- * Initial version of mLib
- *
- */
-
 #ifndef MLIB_DSTR_H
 #define MLIB_DSTR_H
 
@@ -83,15 +50,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 ------------------------------------------------*/
 
@@ -111,6 +87,7 @@ extern void dstr_create(dstr */*d*/);
   _dd->buf = 0;                                                                \
   _dd->sz = 0;                                                         \
   _dd->len = 0;                                                                \
+  _dd->a = &arena_stdlib;                                              \
 } while (0)
 
 /* --- @dstr_destroy@ --- *
@@ -127,7 +104,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)
 
@@ -216,7 +193,7 @@ extern void dstr_puts(dstr */*d*/, const char */*s*/);
 #define DPUTS(d, s) do {                                               \
   dstr *_d = (d);                                                      \
   const char *_s = (s);                                                        \
-  size_t _sz = strlen(s);                                              \
+  size_t _sz = strlen(_s);                                             \
   DENSURE(_d, _sz + 1);                                                        \
   memcpy(_d->buf + _d->len, _s, _sz + 1);                              \
   _d->len += _sz;                                                      \
@@ -226,7 +203,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.
  *
@@ -234,7 +211,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@ --- *
  *