chiark
/
gitweb
/
~mdw
/
mLib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change interface for @dstr_vputf@.
[mLib]
/
dputf.c
diff --git
a/dputf.c
b/dputf.c
index 5df210c055f67c35b8e821a9075c28009956ecc3..ba23d9869dc73bc7abfb71dfeb20bd71029548ae 100644
(file)
--- a/
dputf.c
+++ b/
dputf.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: dputf.c,v 1.
3 2001/01/20 12:06:01
mdw Exp $
+ * $Id: dputf.c,v 1.
5 2002/01/13 13:30:48
mdw Exp $
*
* `printf'-style formatting for dynamic strings
*
*
* `printf'-style formatting for dynamic strings
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: dputf.c,v $
/*----- 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).
+ *
* Revision 1.3 2001/01/20 12:06:01 mdw
* Define flags with macros, to ensure unsignedness.
*
* Revision 1.3 2001/01/20 12:06:01 mdw
* Define flags with macros, to ensure unsignedness.
*
@@
-44,13
+50,16
@@
/*----- Header files ------------------------------------------------------*/
#include <ctype.h>
/*----- Header files ------------------------------------------------------*/
#include <ctype.h>
-#include <float.h>
#include <math.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+
#include "dstr.h"
/*----- Tunable constants -------------------------------------------------*/
#include "dstr.h"
/*----- Tunable constants -------------------------------------------------*/
@@
-68,7
+77,7
@@
*
* Arguments: @dstr *d@ = pointer to a dynamic string block
* @const char *p@ = pointer to @printf@-style format string
*
* 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.
*
*
* Returns: The number of characters written to the string.
*
@@
-76,7
+85,7
@@
* supplied functions with @printf@-style interfaces.
*/
* 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;
{
const char *q = p;
size_t n = d->len;
@@
-158,7
+167,7
@@
int dstr_vputf(dstr *d, const char *p, va_list ap)
getnum:
*ip = 0;
if (*p == '*') {
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 {
DENSURE(&dd, DSTR_PUTFSTEP);
dd.len += sprintf(dd.buf + dd.len, "%i", *ip);
} else {
@@
-185,13
+194,14
@@
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,
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,
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':
goto formatted;
case 'e': case 'E': case 'f': case 'F': case 'g': case 'G':
+#ifdef HAVE_FLOAT_H
DPUTC(&dd, *p);
DPUTZ(&dd);
if (*p == 'f') {
DPUTC(&dd, *p);
DPUTZ(&dd);
if (*p == 'f') {
@@
-208,11
+218,14
@@
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,
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,
else
d->len += sprintf(d->buf + d->len, dd.buf,
- va_arg(ap, double));
+ va_arg(
*
ap, double));
goto formatted;
goto formatted;
+#else
+ DPUTS(d, "<no float support>");
+#endif
case 'c':
DPUTC(&dd, *p);
case 'c':
DPUTC(&dd, *p);
@@
-221,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,
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': {
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);
sz = strlen(s);
DPUTC(&dd, *p);
DPUTZ(&dd);
@@
-247,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,
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)
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)
else if (f & f_short)
- *va_arg(ap, short *) = (short)(d->len - n);
+ *va_arg(
*
ap, short *) = (short)(d->len - n);
else
else
- *va_arg(ap, int *) = (int)(d->len - n);
+ *va_arg(
*
ap, int *) = (int)(d->len - n);
goto formatted;
/* --- Other random stuff --- */
goto formatted;
/* --- Other random stuff --- */
@@
-305,7
+318,7
@@
int dstr_putf(dstr *d, const char *p, ...)
int n;
va_list ap;
va_start(ap, 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);
}
va_end(ap);
return (n);
}