From 78cd0e1e0165b59638e4bf0af2e48612bd35fb1b Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 10 Feb 2013 17:19:56 +0100
Subject: [PATCH] s/\<timezone\>/tz/ in order to not shadow the timezone var
 from time.h

---
 include/i3status.h |  4 ++--
 src/print_time.c   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/i3status.h b/include/i3status.h
index 01d83d1..f24fec5 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -138,12 +138,12 @@ char *endcolor() __attribute__ ((pure));
 char *auto_detect_format();
 
 /* src/print_time.c */
-void set_timezone(const char *timezone);
+void set_timezone(const char *tz);
 
 void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down);
 void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format);
 void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, int low_threshold, char *threshold_type, bool last_full_capacity);
-void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *timezone, time_t t);
+void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t);
 void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);
 const char *get_ip_addr();
 void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
diff --git a/src/print_time.c b/src/print_time.c
index ad1efdd..e007419 100644
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -11,33 +11,33 @@ static int local_timezone_init = 0;
 static const char *local_timezone = NULL;
 static const char *current_timezone = NULL;
 
-void set_timezone(const char *timezone) {
+void set_timezone(const char *tz) {
         if (!local_timezone_init) {
                 /* First call, initialize. */
                 local_timezone = getenv("TZ");
                 local_timezone_init = 1;
         }
-        if (timezone == NULL || timezone[0] == '\0') {
+        if (tz == NULL || tz[0] == '\0') {
                 /* User wants localtime. */
-                timezone = local_timezone;
+                tz = local_timezone;
         }
-        if (timezone != current_timezone) {
-                if (timezone) {
-                        setenv("TZ", timezone, 1);
+        if (tz != current_timezone) {
+                if (tz) {
+                        setenv("TZ", tz, 1);
                 } else {
                         unsetenv("TZ");
                 }
                 tzset();
-                current_timezone = timezone;
+                current_timezone = tz;
         }
 }
 
-void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *timezone, time_t t) {
+void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t) {
         char *outwalk = buffer;
         struct tm tm;
 
         /* Convert time and format output. */
-        set_timezone(timezone);
+        set_timezone(tz);
         localtime_r(&t, &tm);
         outwalk += strftime(outwalk, 4095, format, &tm);
         *outwalk = '\0';
-- 
2.39.5