From c87be3e4d6ae90dcc48b5f26dd87645e7cabff01 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 17 Apr 2000 17:10:18 +0000 Subject: Mon Apr 17 12:46:00 2000 Marek Michalkiewicz * libc/signal/signal.c (_signal_r) : Removed unused local variable temp. * libc/stdio/findfp.c (std): Added declaration of flags and file. * libc/stdio/mktemp.c (_gettemp, _mkstemp_r, mkstemp): Added int return type. * libc/stdio/putchar.c (putchar): Added return statement. * libc/stdio/refill.c (lflush): Added correct parentheses. * libc/stdio/vfprintf.c (_VFPRINTF_R): Ditto. * libc/stdio/vfscanf.c (__svfscanf): Changed sprintf call which prints long value to use l qualifier. * libc/stdlib/dtoa.c (_dtoa_r): Added parentheses to remove warning messages and initialized local values: ilim, ilim1, and spec_case. * libc/stdlib/ecvtbuf.c (print_e): Removed unused variable dp. * libc/stdlib/mbctype.h (_issjis1, _issjis2): Added parentheses. * libc/stdlib/mprec.c: Ditto. * libc/stdlib/setenv_r.c: Ditto. * libc/stdlib/strtod.c: Ditto. * libc/stdlib/strtol.c: Ditto. * libc/stdlib/strtoul.c: Ditto. * libm/common/sf_expm1.c: Added curly braces to if else clauses. * libm/common/sf_log1p.c: Ditto. * libm/common/sf_scalbn.c: Ditto. * libm/math/ef_log.c: Ditto. --- newlib/libc/stdio/findfp.c | 2 ++ newlib/libc/stdio/mktemp.c | 4 +++- newlib/libc/stdio/putchar.c | 2 +- newlib/libc/stdio/refill.c | 2 +- newlib/libc/stdio/vfprintf.c | 2 +- newlib/libc/stdio/vfscanf.c | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) (limited to 'newlib/libc/stdio') diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c index 650c638e6..9dd18996d 100644 --- a/newlib/libc/stdio/findfp.c +++ b/newlib/libc/stdio/findfp.c @@ -26,6 +26,8 @@ static void std (ptr, flags, file, data) FILE *ptr; + int flags; + int file; struct _reent *data; { ptr->_p = 0; diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c index f6a6b688f..54c7a9793 100644 --- a/newlib/libc/stdio/mktemp.c +++ b/newlib/libc/stdio/mktemp.c @@ -102,7 +102,7 @@ Supporting OS subroutines required: <>, <>, <>. #include #include -static +static int _DEFUN (_gettemp, (ptr, path, doopen), struct _reent *ptr _AND char *path _AND @@ -182,6 +182,7 @@ _DEFUN (_gettemp, (ptr, path, doopen), /*NOTREACHED*/ } +int _DEFUN (_mkstemp_r, (ptr, path), struct _reent *ptr _AND char *path) @@ -201,6 +202,7 @@ _DEFUN (_mktemp_r, (ptr, path), #ifndef _REENT_ONLY +int _DEFUN (mkstemp, (path), char *path) { diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c index 7f7c442e4..462393f8a 100644 --- a/newlib/libc/stdio/putchar.c +++ b/newlib/libc/stdio/putchar.c @@ -88,7 +88,7 @@ putchar (c) { /* CHECK_INIT is (eventually) called by __swbuf. */ - _putchar_r (_REENT, c); + return _putchar_r (_REENT, c); } #endif diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c index bc3b83047..ca48a4500 100644 --- a/newlib/libc/stdio/refill.c +++ b/newlib/libc/stdio/refill.c @@ -25,7 +25,7 @@ static int lflush (fp) FILE *fp; { - if ((fp->_flags & (__SLBF | __SWR)) == __SLBF | __SWR) + if ((fp->_flags & (__SLBF | __SWR)) == (__SLBF | __SWR)) return fflush (fp); return 0; } diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index 8da76db99..41f7d52e9 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -824,7 +824,7 @@ number: if ((dprec = prec) >= 0) ox[0] = *cp++; ox[1] = '.'; PRINT(ox, 2); - if (_double || flags & ALT == 0) { + if (_double || (flags & ALT) == 0) { PRINT(cp, ndig-1); } else /* 0.[0..] */ /* __dtoa irregularity */ diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index f1d328a20..e9c67fca1 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -825,7 +825,7 @@ __svfscanf (fp, fmt0, ap) truncate some trailing digits to make room. */ if (exp_start >= buf + sizeof (buf) - MAX_LONG_LEN) exp_start = buf + sizeof (buf) - MAX_LONG_LEN - 1; - sprintf (exp_start, "e%d", new_exp); + sprintf (exp_start, "e%ld", new_exp); } res = atof (buf); if (flags & LONG) -- cgit v1.2.3