More portability enhancements.

[mLib] / dstr.c

diff --git a/dstr.c b/dstr.c
index 85fb6c0bf994994f8146b0f4c6692b01ce319e66..86cde6e27c962db9eaeb18e59c8b7bea4d605ddd 100644 (file)
--- 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.8 1999/06/01 09:47:52 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.c,v $
+ * Revision 1.8  1999/06/01 09:47:52  mdw
+ * Fix nasty bugs in `dstr_vputf'.
+ *
+ * Revision 1.7  1999/05/21 22:14:30  mdw
+ * Take advantage of the new dynamic string macros.
+ *
+ * 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 +87,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 +98,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 +109,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 +166,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 +179,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 +192,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@ --- *
  *
@@ -226,11 +211,11 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
   const char *q = p;
   size_t n = d->len;
   size_t sz;
+  dstr dd = DSTR_INIT;
 
   while (*p) {
     unsigned f;
     int wd, prec;
-    dstr dd;
 
     enum {
       f_short = 1,
@@ -254,7 +239,6 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
 
     /* --- Sort out the various silly flags and things --- */
 
-    dstr_create(&dd);
     DPUTC(&dd, '%');
     f = 0;
     sz = DSTR_PUTFSTEP;
@@ -297,7 +281,7 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
          goto getnum;
        default:
          if (isdigit((unsigned char)*p)) {
-           f |= f_prec;
+           f |= f_wd;
            ip = &wd;
            goto getnum;
          }
@@ -310,12 +294,12 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
            DENSURE(&dd, DSTR_PUTFSTEP);
            dd.len += sprintf(dd.buf + dd.len, "%i", *ip);
          } else {
-           *ip = *p + '0';
+           *ip = *p - '0';
            DPUTC(&dd, *p);
            p++;
            while (isdigit((unsigned char)*p)) {
              DPUTC(&dd, *p);
-             *ip = 10 * *ip + *p++ + '0';
+             *ip = 10 * *ip + *p++ - '0';
            }
          }
          break;
@@ -417,13 +401,14 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
     }
 
   formatted:
-    dstr_destroy(&dd);
+    DRESET(&dd);
     q = ++p;
   }
 
   DPUTM(d, q, p - q);
 finished:
   DPUTZ(d);
+  DDESTROY(&dd);
   return (d->len - n);
 }
 
@@ -462,10 +447,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 +459,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 +541,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 -------------------------------------------------*/