From: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Date: Tue, 19 Sep 2017 15:00:56 +0000 (+0200)
Subject: time-util: fix shadowing of timezone
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ae0d3a782fa7062d15c8e5dbdee2b11ca0cff169;p=elogind.git

time-util: fix shadowing of timezone

timezone was shadowing timezone from time.h which leads to a buildbreak
since elogind is built with -Werror
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 9bcf5725e..c19c3f60f 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -896,16 +896,16 @@ typedef struct ParseTimestampResult {
 } ParseTimestampResult;
 
 int parse_timestamp(const char *t, usec_t *usec) {
-        char *last_space, *timezone = NULL;
+        char *last_space, *tz = NULL;
         ParseTimestampResult *shared, tmp;
         int r;
         pid_t pid;
 
         last_space = strrchr(t, ' ');
         if (last_space != NULL && timezone_is_valid(last_space + 1))
-                timezone = last_space + 1;
+                tz = last_space + 1;
 
-        if (timezone == NULL || endswith_no_case(t, " UTC"))
+        if (tz == NULL || endswith_no_case(t, " UTC"))
                 return parse_timestamp_impl(t, usec, false);
 
         t = strndupa(t, last_space - t);
@@ -923,7 +923,7 @@ int parse_timestamp(const char *t, usec_t *usec) {
         }
 
         if (pid == 0) {
-                if (setenv("TZ", timezone, 1) != 0) {
+                if (setenv("TZ", tz, 1) != 0) {
                         shared->return_value = negative_errno();
                         _exit(EXIT_FAILURE);
                 }