chiark / gitweb /
buf: Fix two embarassing bugs found while writing Lisp bindings.
[mLib] / dstr.h
diff --git a/dstr.h b/dstr.h
index 938378a..d30a4f9 100644 (file)
--- a/dstr.h
+++ b/dstr.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.6 1999/05/21 08:38:14 mdw Exp $
+ * $Id: dstr.h,v 1.13 2004/04/08 01:36:11 mdw Exp $
  *
  * Handle dynamically growing strings
  *
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: dstr.h,v $
- * 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 DSTR_H
-#define DSTR_H
+#ifndef MLIB_DSTR_H
+#define MLIB_DSTR_H
 
 #ifdef __cplusplus
   extern "C" {
 #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 ------------------------------------------------*/
 
@@ -98,9 +83,11 @@ typedef struct dstr {
 extern void dstr_create(dstr */*d*/);
 
 #define DCREATE(d) do {                                                        \
-  (d)->buf = 0;                                                                \
-  (d)->sz = 0;                                                         \
-  (d)->len = 0;                                                                \
+  dstr *_dd = (d);                                                     \
+  _dd->buf = 0;                                                                \
+  _dd->sz = 0;                                                         \
+  _dd->len = 0;                                                                \
+  _dd->a = &arena_stdlib;                                              \
 } while (0)
 
 /* --- @dstr_destroy@ --- *
@@ -115,13 +102,15 @@ extern void dstr_create(dstr */*d*/);
 extern void dstr_destroy(dstr */*d*/);
 
 #define DDESTROY(d) do {                                               \
-  if ((d)->buf) free((d)->buf);                                                \
-  DCREATE(d);                                                          \
+  dstr *_d = (d);                                                      \
+  if (_d->buf)                                                         \
+    x_free(_d->a, _d->buf);                                            \
+  DCREATE(_d);                                                         \
 } while (0)
 
 /* --- @dstr_reset@ --- *
  *
- * Arguments:  @dstr *d@ = pointer to a dynaimc string block
+ * Arguments:  @dstr *d@ = pointer to a dynamic string block
  *
  * Returns:    ---
  *
@@ -130,7 +119,7 @@ extern void dstr_destroy(dstr */*d*/);
 
 extern void dstr_reset(dstr */*d*/);
 
-#define DRESET(d) do (d)->len = 0; while (0)
+#define DRESET(d) ((d)->len = 0)
 
 /* --- @dstr_ensure@ --- *
  *
@@ -146,7 +135,9 @@ extern void dstr_reset(dstr */*d*/);
 extern void dstr_ensure(dstr */*d*/, size_t /*sz*/);
 
 #define DENSURE(d, rq) do {                                            \
-  if ((d)->len + (rq) > (d)->sz) dstr_ensure((d), (rq));               \
+  dstr *_dd = (d);                                                     \
+  size_t _rq = (rq);                                                   \
+  if (_dd->len + _rq > _dd->sz) dstr_ensure(_dd, _rq);                 \
 } while (0)
 
 /* --- @dstr_putc@ --- *
@@ -162,8 +153,9 @@ extern void dstr_ensure(dstr */*d*/, size_t /*sz*/);
 extern void dstr_putc(dstr */*d*/, char /*ch*/);
 
 #define DPUTC(d, ch) do {                                              \
-  DENSURE((d), 1);                                                     \
-  (d)->buf[(d)->len++] = (ch);                                         \
+  dstr *_d = (d);                                                      \
+  DENSURE(_d, 1);                                                      \
+  _d->buf[_d->len++] = (ch);                                           \
 } while (0)
 
 /* --- @dstr_putz@ --- *
@@ -180,8 +172,9 @@ extern void dstr_putc(dstr */*d*/, char /*ch*/);
 extern void dstr_putz(dstr */*d*/);
 
 #define DPUTZ(d) do {                                                  \
-  DENSURE((d), 1);                                                     \
-  (d)->buf[(d)->len] = 0;                                              \
+  dstr *_d = (d);                                                      \
+  DENSURE(_d, 1);                                                      \
+  _d->buf[_d->len] = 0;                                                \
 } while (0)
 
 /* --- @dstr_puts@ --- *
@@ -198,17 +191,19 @@ extern void dstr_putz(dstr */*d*/);
 extern void dstr_puts(dstr */*d*/, const char */*s*/);
 
 #define DPUTS(d, s) do {                                               \
-  size_t sz = strlen(s);                                               \
-  DENSURE((d), sz + 1);                                                        \
-  memcpy((d)->buf + (d)->len, (s), sz + 1);                            \
-  (d)->len += sz;                                                      \
+  dstr *_d = (d);                                                      \
+  const char *_s = (s);                                                        \
+  size_t _sz = strlen(_s);                                             \
+  DENSURE(_d, _sz + 1);                                                        \
+  memcpy(_d->buf + _d->len, _s, _sz + 1);                              \
+  _d->len += _sz;                                                      \
 } while (0)
 
 /* --- @dstr_vputf@ --- *
  *
  * 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.
  *
@@ -216,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@ --- *
  *
@@ -248,10 +243,12 @@ extern int dstr_putf(dstr */*d*/, const char */*p*/, ...);
 extern void dstr_putd(dstr */*d*/, const dstr */*s*/);
 
 #define DPUTD(d, s) do {                                               \
-  DENSURE((d), (s)->len + 1);                                          \
-  memcpy((d)->buf + (d)->len, (s)->buf, (s)->len);                     \
-  (d)->len += (s)->len;                                                        \
-  (d)->buf[(d)->len] = 0;                                              \
+  dstr *_d = (d);                                                      \
+  const dstr *_s = (s);                                                        \
+  DENSURE(_d, _s->len + 1);                                            \
+  memcpy(_d->buf + _d->len, _s->buf, _s->len);                         \
+  _d->len += _s->len;                                                  \
+  _d->buf[_d->len] = 0;                                                        \
 } while (0)
 
 /* --- @dstr_putm@ --- *
@@ -267,9 +264,11 @@ extern void dstr_putd(dstr */*d*/, const dstr */*s*/);
 extern void dstr_putm(dstr */*d*/, const void */*p*/, size_t /*sz*/);
 
 #define DPUTM(d, p, sz) do {                                           \
-  DENSURE((d), (sz));                                                  \
-  memcpy((d)->buf + (d)->len, (p), (sz));                              \
-  (d)->len += (sz);                                                    \
+  dstr *_d = (d);                                                      \
+  size_t _sz = (sz);                                                   \
+  DENSURE(_d, _sz);                                                    \
+  memcpy(_d->buf + _d->len, (p), _sz);                                 \
+  _d->len += _sz;                                                      \
 } while (0)
 
 /* --- @dstr_tidy@ --- *