From b2bde18ba5c1f6d6555083cba139bd813ebbd6e0 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 10 Aug 2012 15:21:57 +0000 Subject: [PATCH] * libc/stdlib/btowc.c (btowc): Cast to avoid compiler warning. * libc/search/hash_buf.c (__get_buf): Initialize local vars to avoid compiler warning. * libc/stdio/fgets.c (_fgets_r): Ditto. * libc/time/strftime.c (strftime): Ditto. --- newlib/ChangeLog | 8 ++++++++ newlib/libc/search/hash_buf.c | 4 ++-- newlib/libc/stdio/fgets.c | 2 +- newlib/libc/stdlib/btowc.c | 3 ++- newlib/libc/time/strftime.c | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 108d87b12..3072d9220 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,11 @@ +2012-08-10 Corinna Vinschen + + * libc/stdlib/btowc.c (btowc): Cast to avoid compiler warning. + * libc/search/hash_buf.c (__get_buf): Initialize local vars to avoid + compiler warning. + * libc/stdio/fgets.c (_fgets_r): Ditto. + * libc/time/strftime.c (strftime): Ditto. + 2012-08-10 Corinna Vinschen * libc/stdio/vfwprintf.c (_VFWPRINTF_R): Fix guard around state to diff --git a/newlib/libc/search/hash_buf.c b/newlib/libc/search/hash_buf.c index 3dfc2069f..d50fc5720 100644 --- a/newlib/libc/search/hash_buf.c +++ b/newlib/libc/search/hash_buf.c @@ -119,8 +119,8 @@ __get_buf(hashp, addr, prev_bp, newpage) { BUFHEAD *bp; __uint32_t is_disk_mask; - int is_disk, segment_ndx; - SEGMENT segp; + int is_disk, segment_ndx = 0; + SEGMENT segp = NULL; is_disk = 0; is_disk_mask = 0; diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c index 1644fba6a..319cfd576 100644 --- a/newlib/libc/stdio/fgets.c +++ b/newlib/libc/stdio/fgets.c @@ -102,7 +102,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp), #ifdef __SCLE if (fp->_flags & __SCLE) { - int c; + int c = 0; /* Sorry, have to do it the slow way */ while (--n > 0 && (c = __sgetc_r (ptr, fp)) != EOF) { diff --git a/newlib/libc/stdlib/btowc.c b/newlib/libc/stdlib/btowc.c index ec6c29152..354a1d6e1 100644 --- a/newlib/libc/stdlib/btowc.c +++ b/newlib/libc/stdlib/btowc.c @@ -23,7 +23,8 @@ btowc (int c) _REENT_CHECK_MISC(_REENT); - retval = __mbtowc (_REENT, &pwc, &b, 1, __locale_charset (), &mbs); + retval = __mbtowc (_REENT, &pwc, (const char *) &b, 1, + __locale_charset (), &mbs); if (retval != 0 && retval != 1) return WEOF; diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c index 840e310db..2bcedb2a0 100644 --- a/newlib/libc/time/strftime.c +++ b/newlib/libc/time/strftime.c @@ -693,7 +693,7 @@ _DEFUN (strftime, (s, maxsize, format, tim_p), #endif /* !_WANT_C99_TIME_FORMATS */ { size_t count = 0; - int i, len; + int i, len = 0; const CHAR *ctloc; #if defined (MAKE_WCSFTIME) && !defined (__HAVE_LOCALE_INFO_EXTENDED__) CHAR ctlocbuf[CTLOCBUFLEN];