Fix the bugs in the new macros. (Whoops.)

[mLib] / dstr.c

diff --git a/dstr.c b/dstr.c
index 06a621ea66a6306e523408b800ac1149ead2920c..6304351ea64eb8cab0ebf9866bdd7b1290c8611a 100644 (file)
--- a/dstr.c
+++ b/dstr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.c,v 1.3 1999/05/05 18:50:31 mdw Exp $
+ * $Id: dstr.c,v 1.6 1999/05/21 08:38:33 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -22,13 +22,23 @@
  * 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.
+ * 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.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.
+ *
+ * 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.
  *
@@ -68,15 +78,10 @@
  *
  * Returns:    ---
  *
- * Use:                Initialises a dynamic string.
+ * 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@ --- *
  *
@@ -87,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@ --- *
  *
@@ -105,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@ --- *
  *
@@ -165,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@ --- *
  *
@@ -181,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@ --- *
  *
@@ -197,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@ --- *
  *
@@ -208,7 +194,7 @@ void dstr_puts(dstr *d, const char *s)
  *             @const char *p@ = pointer to @printf@-style format string
  *             @va_list ap@ = argument handle
  *
- * Returns:    ---
+ * Returns:    The number of characters written to the string.
  *
  * Use:                As for @dstr_putf@, but may be used as a back-end to user-
  *             supplied functions with @printf@-style interfaces.
@@ -426,7 +412,7 @@ finished:
  *             @const char *p@ = pointer to @printf@-style format string
  *             @...@ = argument handle
  *
- * Returns:    ---
+ * Returns:    The number of characters written to the string.
  *
  * Use:                Writes a piece of text to a dynamic string, doing @printf@-
  *             style substitutions as it goes.  Intended to be robust if
@@ -455,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@ --- *
  *
@@ -470,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@ --- *
  *
@@ -555,9 +535,6 @@ int dstr_putline(dstr *d, FILE *fp)
  * Use:                Writes a dynamic string to a file.
  */
 
-size_t dstr_write(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 -------------------------------------------------*/