stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fmt: print directly to stream using handler (#38)

Browse source
This commit is contained in:
Alfred E. Heggestad 2017-01-06 15:45:22 +01:00 • committed by Richard Aas
parent e167b2c154
commit f115a7418e
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/fmt/print.c
View file

@ -550,6 +550,24 @@ static int print_handler_dyn(const char *p, size_t size, void *arg)
}
struct strm_print {
FILE *f;
size_t n;
};
static int print_handler_stream(const char *p, size_t size, void *arg)
{
struct strm_print *sp = arg;
if (1 != fwrite(p, size, 1, sp->f))
return ENOMEM;
sp->n += size;
return 0;
}
/**
* Print a formatted string to a file stream, using va_list
*
@ -561,25 +579,18 @@ static int print_handler_dyn(const char *p, size_t size, void *arg)
*/
int re_vfprintf(FILE *stream, const char *fmt, va_list ap)
{
char buf[4096]; /* TODO: avoid static, use print_handler_dyn ? */
struct pl pl;
size_t n;
struct strm_print sp;
if (!stream)
return -1;
pl.p = buf;
pl.l = sizeof(buf);
sp.f = stream;
sp.n = 0;
if (0 != re_vhprintf(fmt, ap, print_handler, &pl))
if (0 != re_vhprintf(fmt, ap, print_handler_stream, &sp))
return -1;
n = sizeof(buf) - pl.l;
if (1 != fwrite(buf, n, 1, stream))
return -1;
return (int)n;
return (int)sp.n;
}