From fb467548a1501cae398e5bdab6794926da2690ef Mon Sep 17 00:00:00 2001
Message-Id: <fb467548a1501cae398e5bdab6794926da2690ef.1715203144.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 21 May 1999 08:38:33 +0000
Subject: [PATCH] Implement some more functions in terms of macros.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 dstr.c | 56 +++++++++++++-------------------------------------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/dstr.c b/dstr.c
index 85fb6c0..6304351 100644
--- a/dstr.c
+++ b/dstr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.c,v 1.5 1999/05/13 22:47:57 mdw Exp $
+ * $Id: dstr.c,v 1.6 1999/05/21 08:38:33 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.c,v $
+ * Revision 1.6  1999/05/21 08:38:33  mdw
+ * Implement some more functions in terms of macros.
+ *
  * Revision 1.5  1999/05/13 22:47:57  mdw
  * Misc documentation fixes.  Change `-ise' to `-ize' throughout.
  *
@@ -78,12 +81,7 @@
  * Use:		Initializes a dynamic string.
  */
 
-void dstr_create(dstr *d)
-{
-  d->sz = 0;
-  d->len = 0;
-  d->buf = 0;
-}
+void dstr_create(dstr *d) { DCREATE(d); }
 
 /* --- @dstr_destroy@ --- *
  *
@@ -94,14 +92,7 @@ void dstr_create(dstr *d)
  * Use:		Reclaims the space used by a dynamic string.
  */
 
-void dstr_destroy(dstr *d)
-{
-  if (d->buf)
-    free(d->buf);
-  d->buf = 0;
-  d->len = 0;
-  d->sz = 0;
-}
+void dstr_destroy(dstr *d) { DDESTROY(d); }
 
 /* --- @dstr_reset@ --- *
  *
@@ -112,10 +103,7 @@ void dstr_destroy(dstr *d)
  * Use:		Resets a string so that new data gets put at the beginning.
  */
 
-void dstr_reset(dstr *d)
-{
-  d->len = 0;
-}
+void dstr_reset(dstr *d) { DRESET(d); }
 
 /* --- @dstr_ensure@ --- *
  *
@@ -172,10 +160,7 @@ void dstr_ensure(dstr *d, size_t sz)
  * Use:		Appends a character to a string.
  */
 
-void dstr_putc(dstr *d, char ch)
-{
-  DPUTC(d, ch);
-}
+void dstr_putc(dstr *d, char ch) { DPUTC(d, ch); }
 
 /* --- @dstr_putz@ --- *
  *
@@ -188,10 +173,7 @@ void dstr_putc(dstr *d, char ch)
  *		by subsequent `put' operations.
  */
 
-void dstr_putz(dstr *d)
-{
-  DPUTZ(d);
-}
+void dstr_putz(dstr *d) { DPUTZ(d); }
 
 /* --- @dstr_puts@ --- *
  *
@@ -204,10 +186,7 @@ void dstr_putz(dstr *d)
  *		byte is added, as for @dstr_putz@.
  */
 
-void dstr_puts(dstr *d, const char *s)
-{
-  DPUTS(d, s);
-}
+void dstr_puts(dstr *d, const char *s) { DPUTS(d, s); }
 
 /* --- @dstr_vputf@ --- *
  *
@@ -462,10 +441,7 @@ int dstr_putf(dstr *d, const char *p, ...)
  *		byte is added, as for @dstr_putz@.
  */
 
-void dstr_putd(dstr *d, const dstr *s)
-{
-  DPUTD(d, s);
-}
+void dstr_putd(dstr *d, const dstr *s) { DPUTD(d, s); }
 
 /* --- @dstr_putm@ --- *
  *
@@ -477,10 +453,7 @@ void dstr_putd(dstr *d, const dstr *s)
  *		null is appended.
  */
 
-void dstr_putm(dstr *d, const void *p, size_t sz)
-{
-  DPUTM(d, p, sz);
-}
+void dstr_putm(dstr *d, const void *p, size_t sz) { DPUTM(d, p, sz); }
 
 /* --- @dstr_tidy@ --- *
  *
@@ -562,9 +535,6 @@ int dstr_putline(dstr *d, FILE *fp)
  * Use:		Writes a dynamic string to a file.
  */
 
-size_t dstr_write(const dstr *d, FILE *fp)
-{
-  return (fwrite(d->buf, 1, d->len, fp));
-}
+size_t dstr_write(const dstr *d, FILE *fp) { return (DWRITE(d, fp)); }
 
 /*----- That's all, folks -------------------------------------------------*/
-- 
[mdw]