Test universal hashing and fix bugs.

[mLib] / dputf.c

diff --git a/dputf.c b/dputf.c
index bb0641ca45182c23b9992858abfc4370e70b59fa..ba23d9869dc73bc7abfb71dfeb20bd71029548ae 100644 (file)
--- a/dputf.c
+++ b/dputf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dputf.c,v 1.4 2001/06/22 19:35:29 mdw Exp $
+ * $Id: dputf.c,v 1.5 2002/01/13 13:30:48 mdw Exp $
  *
  * `printf'-style formatting for dynamic strings
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: dputf.c,v $
+ * Revision 1.5  2002/01/13 13:30:48  mdw
+ * Change interface for @dstr_vputf@.
+ *
  * Revision 1.4  2001/06/22 19:35:29  mdw
  * Find out whether @<float.h>@ exists (hack for uC-Linux).
  *
@@ -74,7 +77,7 @@
  *
  * 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.
  *
@@ -82,7 +85,7 @@
  *             supplied functions with @printf@-style interfaces.
  */
 
-int dstr_vputf(dstr *d, const char *p, va_list ap)
+int dstr_vputf(dstr *d, const char *p, va_list *ap)
 {
   const char *q = p;
   size_t n = d->len;
@@ -164,7 +167,7 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
         getnum:
          *ip = 0;
          if (*p == '*') {
-           *ip = va_arg(ap, int);
+           *ip = va_arg(*ap, int);
            DENSURE(&dd, DSTR_PUTFSTEP);
            dd.len += sprintf(dd.buf + dd.len, "%i", *ip);
          } else {
@@ -191,10 +194,10 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
          DENSURE(d, sz);
          if (f & f_long)
            d->len += sprintf(d->buf + d->len, dd.buf,
-                             va_arg(ap, unsigned long));
+                             va_arg(*ap, unsigned long));
          else
            d->len += sprintf(d->buf + d->len, dd.buf,
-                             va_arg(ap, unsigned int));
+                             va_arg(*ap, unsigned int));
          goto formatted;
 
        case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
@@ -215,10 +218,10 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
          DENSURE(d, sz);
          if (f & f_Long)
            d->len += sprintf(d->buf + d->len, dd.buf,
-                             va_arg(ap, long double));
+                             va_arg(*ap, long double));
          else
            d->len += sprintf(d->buf + d->len, dd.buf,
-                             va_arg(ap, double));
+                             va_arg(*ap, double));
          goto formatted;
 #else
          DPUTS(d, "<no float support>");
@@ -231,11 +234,11 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
            sz = wd + 1;
          DENSURE(d, sz);
          d->len += sprintf(d->buf + d->len, dd.buf,
-                           va_arg(ap, unsigned));
+                           va_arg(*ap, unsigned));
          goto formatted;
 
        case 's': {
-         const char *s = va_arg(ap, const char *);
+         const char *s = va_arg(*ap, const char *);
          sz = strlen(s);
          DPUTC(&dd, *p);
          DPUTZ(&dd);
@@ -257,16 +260,16 @@ int dstr_vputf(dstr *d, const char *p, va_list ap)
            sz = wd + 1;
          DENSURE(d, sz);
          d->len += sprintf(d->buf + d->len, dd.buf,
-                           va_arg(ap, const void *));
+                           va_arg(*ap, const void *));
          goto formatted;
 
        case 'n':
          if (f & f_long)
-           *va_arg(ap, long *) = (long)(d->len - n);
+           *va_arg(*ap, long *) = (long)(d->len - n);
          else if (f & f_short)
-           *va_arg(ap, short *) = (short)(d->len - n);
+           *va_arg(*ap, short *) = (short)(d->len - n);
          else
-           *va_arg(ap, int *) = (int)(d->len - n);
+           *va_arg(*ap, int *) = (int)(d->len - n);
          goto formatted;
 
        /* --- Other random stuff --- */
@@ -315,7 +318,7 @@ int dstr_putf(dstr *d, const char *p, ...)
   int n;
   va_list ap;
   va_start(ap, p);
-  n = dstr_vputf(d, p, ap);
+  n = dstr_vputf(d, p, &ap);
   va_end(ap);
   return (n);
 }