diff options
Diffstat (limited to 'newlib/libc/stdio/printf.c')
| -rw-r--r-- | newlib/libc/stdio/printf.c | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c index 19f465e34..da4cb8ee8 100644 --- a/newlib/libc/stdio/printf.c +++ b/newlib/libc/stdio/printf.c @@ -1,45 +1,30 @@ -/* - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by the University of California, Berkeley. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ #include <_ansi.h> -#include <reent.h> #include <stdio.h> + +#include "local.h" + #ifdef _HAVE_STDC #include <stdarg.h> #else #include <varargs.h> #endif -#include "local.h" #ifdef _HAVE_STDC int -_printf_r(struct _reent *ptr, _CONST char *fmt, ...) +_printf_r (struct _reent *ptr, const char *fmt, ...) #else int -_printf_r(ptr, fmt, va_alist) - struct _reent *ptr; - char *fmt; - va_dcl +_printf_r (ptr, fmt, va_alist) + struct _reent *ptr; + char *fmt; + va_dcl #endif { int ret; va_list ap; - _REENT_SMALL_CHECK_INIT (ptr); + _REENT_SMALL_CHECK_INIT(_stdout_r (ptr)); #ifdef _HAVE_STDC va_start (ap, fmt); #else @@ -54,18 +39,18 @@ _printf_r(ptr, fmt, va_alist) #ifdef _HAVE_STDC int -printf(_CONST char *fmt, ...) +printf (const char *fmt, ...) #else int -printf(fmt, va_alist) - char *fmt; - va_dcl +printf (fmt, va_alist) + char *fmt; + va_dcl #endif { int ret; va_list ap; - _REENT_SMALL_CHECK_INIT (_REENT); + _REENT_SMALL_CHECK_INIT(_stdout_r (_REENT)); #ifdef _HAVE_STDC va_start (ap, fmt); #else |