diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-09-04 12:27:03 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-09-04 12:27:03 +0400 |
| commit | f9bafa4640b2e24394541c7f26fad61ed908fbe3 (patch) | |
| tree | ce6be1413c7c083a30f39ae3a806867b47c62d15 | |
| parent | 4a9103c4100893d3e9e55f96b31434d17f06666d (diff) | |
* libc/time/clock.c (clock): Fix warnings about signed-unsigned
comparisons.
* libc/time/strftime.c (strftime): Likewise.
* libc/time/strptime.c (match_string): Fix warning about discarding
'restrict' qualifier from pointer target type.
| -rw-r--r-- | newlib/ChangeLog | 8 | ||||
| -rw-r--r-- | newlib/libc/time/clock.c | 2 | ||||
| -rw-r--r-- | newlib/libc/time/strftime.c | 6 | ||||
| -rw-r--r-- | newlib/libc/time/strptime.c | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 054133a94..659b28506 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,11 @@ +2014-09-04 Freddie Chopin <freddie_chopin@op.pl> + + * libc/time/clock.c (clock): Fix warnings about signed-unsigned + comparisons. + * libc/time/strftime.c (strftime): Likewise. + * libc/time/strptime.c (match_string): Fix warning about discarding + 'restrict' qualifier from pointer target type. + 2014-09-04 Hale Wang <hale.wang@arm.com> * libc/machine/arm/aeabi_memcpy.c: New file. diff --git a/newlib/libc/time/clock.c b/newlib/libc/time/clock.c index 64cf438fb..0bcfbb6d3 100644 --- a/newlib/libc/time/clock.c +++ b/newlib/libc/time/clock.c @@ -59,7 +59,7 @@ clock () struct tms tim_s; clock_t res; - if ((res = (clock_t) _times_r (_REENT, &tim_s)) != -1) + if ((res = (clock_t) _times_r (_REENT, &tim_s)) != (clock_t) -1) res = (clock_t) (tim_s.tms_utime + tim_s.tms_stime + tim_s.tms_cutime + tim_s.tms_cstime); diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c index f95a85dce..9bdde829a 100644 --- a/newlib/libc/time/strftime.c +++ b/newlib/libc/time/strftime.c @@ -694,12 +694,12 @@ _DEFUN (strftime, (s, maxsize, format, tim_p), #endif /* !_WANT_C99_TIME_FORMATS */ { size_t count = 0; - int i, len = 0; + int len = 0; const CHAR *ctloc; #if defined (MAKE_WCSFTIME) && !defined (__HAVE_LOCALE_INFO_EXTENDED__) CHAR ctlocbuf[CTLOCBUFLEN]; #endif - size_t ctloclen; + size_t i, ctloclen; CHAR alt; CHAR pad; unsigned long width; @@ -1299,7 +1299,7 @@ recurse: case CQ('Z'): if (tim_p->tm_isdst >= 0) { - int size; + size_t size; TZ_LOCK; size = strlen(_tzname[tim_p->tm_isdst > 0]); for (i = 0; i < size; i++) diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c index d7dd7a2b2..19b9fcede 100644 --- a/newlib/libc/time/strptime.c +++ b/newlib/libc/time/strptime.c @@ -68,7 +68,7 @@ is_leap_year (int year) /* Needed for strptime. */ static int -match_string (const char **buf, const char **strs) +match_string (const char *__restrict *buf, const char **strs) { int i = 0; |