From 6eec1a0c05185e7fa8966b1727c5599061813ba2 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Tue, 19 May 1998 22:44:20 +0000 Subject: Added prototype for systems defining __STDC__. * vsnprintf.c (vsnprintf): Added prototype for systems defining __STDC__. * vsnprintf.c (snprintf): Moved toward the end of the file, that the compiler gets correct prototype for vsnprintf(). svn path=/trunk/; revision=206 --- support/ChangeLog | 9 +++++++++ support/vsnprintf.c | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 35 insertions(+), 20 deletions(-) (limited to 'support') diff --git a/support/ChangeLog b/support/ChangeLog index bedffb5d..e5da677d 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,12 @@ +1998-05-19 Martin Baulig + + * vsnprintf.c (vsnprintf): Added prototype for systems + defining __STDC__. + + * vsnprintf.c (snprintf): Moved toward the end of the + file, that the compiler gets correct prototype for + vsnprintf(). + 1998-05-12 Kjartan Maraas * argp-help.c (argp_doc): Backed out previous "fix". :-) diff --git a/support/vsnprintf.c b/support/vsnprintf.c index 0231879d..a2dfb4ed 100644 --- a/support/vsnprintf.c +++ b/support/vsnprintf.c @@ -97,32 +97,14 @@ mcleanup(str, n, p) int #if __STDC__ -snprintf(char *str, size_t n, char const *fmt, ...) -#else -snprintf(str, n, fmt, va_alist) - char *str; - size_t n; - char *fmt; - va_dcl -#endif -{ - va_list ap; -#if __STDC__ - va_start(ap, fmt); +vsnprintf(char *str, size_t n, char const *fmt, va_list ap) #else - va_start(ap); -#endif - - return (vsnprintf(str, n, fmt, ap)); - va_end(ap); -} - -int vsnprintf(str, n, fmt, ap) char *str; size_t n; char *fmt; char *ap; +#endif { struct sigaction osa, nsa; char *p; @@ -149,3 +131,27 @@ vsnprintf(str, n, fmt, ap) return (ret); } +int +#if __STDC__ +snprintf(char *str, size_t n, char const *fmt, ...) +#else +snprintf(str, n, fmt, va_alist) + char *str; + size_t n; + char *fmt; + va_dcl +#endif +{ + va_list ap; +#if __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + + return (vsnprintf(str, n, fmt, ap)); + va_end(ap); +} + + + -- cgit v1.2.1