Mercurial > hg > octave-lojdl > gnulib-hg
changeset 16267:93b1cf6aadc8
strptime: silence gcc warnings
Cross-compiling to mingw raised a couple of gcc warnings.
* lib/strptime.c (__strptime_internal) [!_NL_CURRENT],
[!_LIBC && !HAVE_TM_GMTOFF]: Avoid unused variables.
Reported by Daniel P. Berrange.
Signed-off-by: Eric Blake <eblake@redhat.com>
author | Eric Blake <eblake@redhat.com> |
---|---|
date | Wed, 11 Jan 2012 15:49:20 -0700 |
parents | b1498fa45ab4 |
children | dad15f0cd2ff |
files | ChangeLog lib/strptime.c |
diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-01-11 Eric Blake <eblake@redhat.com> + strptime: silence gcc warnings + * lib/strptime.c (__strptime_internal) [!_NL_CURRENT], + [!_LIBC && !HAVE_TM_GMTOFF]: Avoid unused variables. + Reported by Daniel P. Berrange. + inet_ntop: silence gcc warning * lib/inet_ntop.c (inet_ntop6): Initialize best.base. Reported by Daniel P. Berrange.
--- a/lib/strptime.c +++ b/lib/strptime.c @@ -240,7 +240,6 @@ struct locale_data *const current = locale->__locales[LC_TIME]; #endif - const char *rp_backup; int cnt; size_t val; int have_I, is_pm; @@ -253,14 +252,14 @@ int week_no; #ifdef _NL_CURRENT size_t num_eras; + struct era_entry *era = NULL; + const char *rp_backup; #endif - struct era_entry *era; have_I = is_pm = 0; century = -1; want_century = 0; want_era = 0; - era = NULL; week_no = 0; have_wday = want_xday = have_yday = have_mon = have_mday = have_uweek = 0; @@ -290,10 +289,10 @@ #ifndef _NL_CURRENT /* We need this for handling the 'E' modifier. */ start_over: -#endif - +#else /* Make back up of current processing pointer. */ rp_backup = rp; +#endif switch (*fmt++) { @@ -675,7 +674,9 @@ specify hours. If fours digits are used, minutes are also specified. */ { +#if defined _LIBC || HAVE_TM_GMTOFF bool neg; +#endif int n; val = 0; @@ -683,7 +684,9 @@ ++rp; if (*rp != '+' && *rp != '-') return NULL; +#if defined _LIBC || HAVE_TM_GMTOFF neg = *rp++ == '-'; +#endif n = 0; while (n < 4 && *rp >= '0' && *rp <= '9') {