/* -*-c-*-
*
- * $Id: dstr.h,v 1.6 1999/05/21 08:38:14 mdw Exp $
+ * $Id: dstr.h,v 1.8 1999/07/14 19:45:24 mdw Exp $
*
* Handle dynamically growing strings
*
/*----- Revision history --------------------------------------------------*
*
* $Log: dstr.h,v $
+ * 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.
*
size_t len; /* Length of the string */
} dstr;
-#define DSTR_INIT = { 0, 0, 0 }; /* How to initialize one */
+#define DSTR_INIT { 0, 0, 0 } /* How to initialize one */
/*----- Functions provided ------------------------------------------------*/
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; \
} while (0)
/* --- @dstr_destroy@ --- *
extern void dstr_destroy(dstr */*d*/);
#define DDESTROY(d) do { \
- if ((d)->buf) free((d)->buf); \
- DCREATE(d); \
+ dstr *_d = (d); \
+ if (_d->buf) \
+ free(_d->buf); \
+ DCREATE(_d); \
} while (0)
/* --- @dstr_reset@ --- *
extern void dstr_reset(dstr */*d*/);
-#define DRESET(d) do (d)->len = 0; while (0)
+#define DRESET(d) ((d)->len = 0)
/* --- @dstr_ensure@ --- *
*
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@ --- *
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@ --- *
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@ --- *
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@ --- *
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@ --- *
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@ --- *