Mercurial > gnulib
changeset 37816:4821de9a049f
time_rz: avoid warning from bleeding-edge gcc's -Wnonnull
Compiling with gcc version 6.0.0 20151017 (experimental) (GCC), I
would see this:
lib/time_rz.c: In function 'localtime_rz':
lib/time_rz.c:292:15: error: nonnull argument 'tm' compared to NULL \
[-Werror=nonnull]
if (tm && !save_abbr (tz, tm))
^
That was complaining about "tm" because it is a parameter that was
declared with the __nonnull__ attribute.
* lib/time_rz.c (localtime_rz): Don't bother setting "tm" to the
result of localtime_r.
| author | Jim Meyering <meyering@fb.com> |
|---|---|
| date | Sun, 18 Oct 2015 09:32:21 -0700 |
| parents | 6fac7194a714 |
| children | b672c86363fa |
| files | ChangeLog lib/time_rz.c |
| diffstat | 2 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 17 19:18:01 2015 -0700 +++ b/ChangeLog Sun Oct 18 09:32:21 2015 -0700 @@ -1,3 +1,20 @@ +2015-10-18 Jim Meyering <meyering@fb.com> + + time_rz: avoid warning from bleeding-edge gcc's -Wnonnull + Compiling with gcc version 6.0.0 20151017 (experimental) (GCC), I + would see this: + + lib/time_rz.c: In function 'localtime_rz': + lib/time_rz.c:292:15: error: nonnull argument 'tm' compared to NULL \ + [-Werror=nonnull] + if (tm && !save_abbr (tz, tm)) + ^ + + That was complaining about "tm" because it is a parameter that was + declared with the __nonnull__ attribute. + * lib/time_rz.c (localtime_rz): Don't bother setting "tm" to the + result of localtime_r. + 2015-10-17 Jim Meyering <meyering@fb.com> maint.mk: _gl_TS_function_match: fix "extern" name extracting regexp
--- a/lib/time_rz.c Sat Oct 17 19:18:01 2015 -0700 +++ b/lib/time_rz.c Sun Oct 18 09:32:21 2015 -0700 @@ -288,8 +288,7 @@ timezone_t old_tz = set_tz (tz); if (old_tz) { - tm = localtime_r (t, tm); - if (tm && !save_abbr (tz, tm)) + if (localtime_r (t, tm) && !save_abbr (tz, tm)) tm = NULL; if (revert_tz (old_tz)) return tm;