summaryrefslogtreecommitdiffstats
path: root/newlib/libc/stdio/vdprintf.c
diff options
context:
space:
mode:
Diffstat (limited to 'newlib/libc/stdio/vdprintf.c')
-rw-r--r--newlib/libc/stdio/vdprintf.c47
1 files changed, 22 insertions, 25 deletions
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index acd193a13..617d9db1f 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -1,4 +1,4 @@
-/* Copyright 2005 Shaun Jackman
+/* Copyright 2005, 2007 Shaun Jackman
* Permission to use, copy, modify, and distribute this software
* is freely granted, provided that this notice is preserved.
*/
@@ -8,39 +8,36 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
int
-_DEFUN (_vdprintf_r, (ptr, fd, format, ap),
- struct _reent *ptr _AND
- int fd _AND
- _CONST char *format _AND
- va_list ap)
+_DEFUN(_vdprintf_r, (ptr, fd, format, ap),
+ struct _reent *ptr _AND
+ int fd _AND
+ const char *format _AND
+ va_list ap)
{
- char *p;
- int n;
- _REENT_SMALL_CHECK_INIT (ptr);
- n = _vasprintf_r (ptr, &p, format, ap);
- if (n == -1) return -1;
- n = _write_r (ptr, fd, p, n);
- _free_r (ptr, p);
- return n;
+ char *p;
+ int n;
+
+ _REENT_SMALL_CHECK_INIT (ptr);
+ n = _vasprintf_r (ptr, &p, format, ap);
+ if (n == -1)
+ return -1;
+ n = _write_r (ptr, fd, p, n);
+ _free_r (ptr, p);
+ return n;
}
#ifndef _REENT_ONLY
-int
-_DEFUN (vdprintf, (fd, format, ap),
- int fd _AND
- _CONST char *format _AND
- va_list ap)
+int
+_DEFUN(vdprintf, (fd, format, ap),
+ int fd _AND
+ const char *format _AND
+ va_list ap)
{
- _REENT_SMALL_CHECK_INIT (_REENT);
- return _vdprintf_r (_REENT, fd, format, ap);
+ return _vdprintf_r (_REENT, fd, format, ap);
}
#endif /* ! _REENT_ONLY */