1 files changed, 47 insertions, 43 deletions

diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index 19f465e34..81fb8a2cb 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -1,79 +1,83 @@
-/*
- * 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>
+
 #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, ...)
-#else
-int
-_printf_r(ptr, fmt, va_alist)
-          struct _reent *ptr;
-          char *fmt;
-          va_dcl
-#endif
+_printf_r (struct _reent *ptr, const char *fmt, ...)
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  ret = _vfprintf_r (ptr, _stdout_r (ptr), fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+_printf_r (ptr, fmt, va_alist)
+     struct _reent *ptr;
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
   ret = _vfprintf_r (ptr, _stdout_r (ptr), fmt, ap);
   va_end (ap);
   return ret;
 }
 
+#endif
+
+
 #ifndef _REENT_ONLY
 
 #ifdef _HAVE_STDC
+
+#include <stdarg.h>
+
 int
-printf(_CONST char *fmt, ...)
-#else
-int
-printf(fmt, va_alist)
-       char *fmt;
-       va_dcl
-#endif
+printf (const char *fmt, ...)
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  _stdout_r (_REENT)->_data = _REENT;
+  ret = vfprintf (_stdout_r (_REENT), fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+printf (fmt, va_alist)
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
+  _stdout_r (_REENT)->_data = _REENT;
   ret = vfprintf (_stdout_r (_REENT), fmt, ap);
   va_end (ap);
   return ret;
 }
 
+#endif /* ! _HAVE_STDC */
+
 #endif /* ! _REENT_ONLY */