marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/\<timezone\>/tz/ in order to not shadow the timezone var from time.h

Browse Source
This commit is contained in:
Michael Stapelberg 2013-02-10 17:19:56 +01:00
parent 2ebe1f3726
commit 78cd0e1e01
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/i3status.h
View File

@ -138,12 +138,12 @@ char *endcolor() __attribute__ ((pure));
char *auto_detect_format(); char *auto_detect_format();
/* src/print_time.c */ /* 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_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_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_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); void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);
const char *get_ip_addr(); 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); void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);

18
src/print_time.c
View File

@ -11,33 +11,33 @@ static int local_timezone_init = 0;
static const char *local_timezone = NULL; static const char *local_timezone = NULL;
static const char *current_timezone = NULL; static const char *current_timezone = NULL;
void set_timezone(const char *timezone) { void set_timezone(const char *tz) {
if (!local_timezone_init) { if (!local_timezone_init) {
/* First call, initialize. */ /* First call, initialize. */
local_timezone = getenv("TZ"); local_timezone = getenv("TZ");
local_timezone_init = 1; local_timezone_init = 1;
} }
if (timezone == NULL || timezone[0] == '\0') { if (tz == NULL || tz[0] == '\0') {
/* User wants localtime. */ /* User wants localtime. */
timezone = local_timezone; tz = local_timezone;
} }
if (timezone != current_timezone) { if (tz != current_timezone) {
if (timezone) { if (tz) {
setenv("TZ", timezone, 1); setenv("TZ", tz, 1);
} else { } else {
unsetenv("TZ"); unsetenv("TZ");
} }
tzset(); 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; char *outwalk = buffer;
struct tm tm; struct tm tm;
/* Convert time and format output. */ /* Convert time and format output. */
set_timezone(timezone); set_timezone(tz);
localtime_r(&t, &tm); localtime_r(&t, &tm);
outwalk += strftime(outwalk, 4095, format, &tm); outwalk += strftime(outwalk, 4095, format, &tm);
*outwalk = '\0'; *outwalk = '\0';