diff options
| author | Jim Meyering <meyering@fb.com> | 2015-10-18 09:32:21 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2015-10-18 09:35:52 -0700 |
| commit | 0de3313d86751b8fc4616aad72cc9b6c707f1b3e (patch) | |
| tree | 79c0f6a362c19c81a877683db5ca72e9cb38a10f /lib/time_rz.c | |
| parent | 37c054af09357276eb560990eba1f20cdc489bfc (diff) | |
| download | gnulib-0de3313d86751b8fc4616aad72cc9b6c707f1b3e.tar.gz | |
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.
Diffstat (limited to 'lib/time_rz.c')
| -rw-r--r-- | lib/time_rz.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/time_rz.c b/lib/time_rz.c index 5e9636f3a3..396cdd2020 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -288,8 +288,7 @@ localtime_rz (timezone_t tz, time_t const *t, struct tm *tm) 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; |