diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 3 | ||||
| -rw-r--r-- | util/argparse.c | 2 | ||||
| -rw-r--r-- | util/strgutil.c | 13 | ||||
| -rw-r--r-- | util/ttyio.c | 8 |
4 files changed, 21 insertions, 5 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 152b859e3..534e59dd3 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,5 +1,8 @@ 2009-09-03 Werner Koch <[email protected]> + * ttyio.c (tty_printf) [_WIN32]: s/xtryasprintf/xtryvasprint/ + * strgutil.c (xtryvasprintf): New. + * estream-printf.c: Include stdint.h only if HAVE_STDINT_H is defined. Problem reported by Nelson H. F. Beebe. * estream.m4: Check for stdint.h. diff --git a/util/argparse.c b/util/argparse.c index 164009062..2f1c6d250 100644 --- a/util/argparse.c +++ b/util/argparse.c @@ -917,7 +917,7 @@ default_strusage( int level ) break; case 11: p = "foo"; break; case 13: p = "0.0"; break; - case 14: p = "Copyright (C) 2008 Free Software Foundation, Inc."; break; + case 14: p = "Copyright (C) 2009 Free Software Foundation, Inc."; break; case 15: p = "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n"; diff --git a/util/strgutil.c b/util/strgutil.c index 5193df0f8..91e20f24b 100644 --- a/util/strgutil.c +++ b/util/strgutil.c @@ -1153,6 +1153,19 @@ xtryasprintf (const char *fmt, ...) } +char * +xtryvasprintf (const char *fmt, va_list arg_ptr) +{ + int rc; + char *buf; + + rc = estream_vasprintf (&buf, fmt, arg_ptr); + if (rc < 0) + return NULL; + return buf; +} + + /**************************************************** ******** locale insensitive ctype functions ******** ****************************************************/ diff --git a/util/ttyio.c b/util/ttyio.c index d02a884ee..3adcdf9ca 100644 --- a/util/ttyio.c +++ b/util/ttyio.c @@ -243,9 +243,9 @@ tty_printf( const char *fmt, ... ) int n; DWORD nwritten; - buf = xtryasprintf(fmt, arg_ptr); + buf = xtryvasprintf(fmt, arg_ptr); if (!buf) - log_bug("xtryasprintf() failed\n"); + log_bug("xtryvasprintf() failed\n"); n = strlen (buf); if (!WriteConsoleA (con.out, buf, n, &nwritten, NULL)) @@ -291,9 +291,9 @@ tty_fprintf (FILE *fp, const char *fmt, ... ) int n; DWORD nwritten; - buf = xtryasprintf (fmt, arg_ptr); + buf = xtryvasprintf (fmt, arg_ptr); if (!buf) - log_bug ("xtryasprintf() failed\n"); + log_bug ("xtryvasprintf() failed\n"); n = strlen (buf); if (!WriteConsoleA (con.out, buf, n, &nwritten, NULL)) |