summaryrefslogtreecommitdiff
path: root/src/print_time.c
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2015-03-16 10:00:32 +0100
committerMichael Stapelberg <michael@stapelberg.de>2015-03-16 10:01:07 +0100
commitd74e904bf4bdd7f1d767a8db09987b90de809579 (patch)
tree07ab4f610c2f222a662daf417f1356154806c29e /src/print_time.c
parent6996f0a4a34e0744f09dbce39a2164c6fcee875e (diff)
clang-format-3.5 -i **/*.[ch], update modeline
From here on, we’ll use clang-format to automatically format the source. This has worked well in i3, so we are introducing it for i3status.
Diffstat (limited to 'src/print_time.c')
-rw-r--r--src/print_time.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/print_time.c b/src/print_time.c
index d19d08b..edbc828 100644
--- a/src/print_time.c
+++ b/src/print_time.c
@@ -1,4 +1,4 @@
-// vim:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
@@ -13,34 +13,34 @@ static const char *local_timezone = NULL;
static const char *current_timezone = NULL;
void set_timezone(const char *tz) {
- if (!local_timezone_init) {
- /* First call, initialize. */
- local_timezone = getenv("TZ");
- local_timezone_init = true;
- }
- if (tz == NULL || tz[0] == '\0') {
- /* User wants localtime. */
- tz = local_timezone;
- }
- if (tz != current_timezone) {
- if (tz) {
- setenv("TZ", tz, 1);
- } else {
- unsetenv("TZ");
- }
- tzset();
- current_timezone = tz;
+ if (!local_timezone_init) {
+ /* First call, initialize. */
+ local_timezone = getenv("TZ");
+ local_timezone_init = true;
+ }
+ if (tz == NULL || tz[0] == '\0') {
+ /* User wants localtime. */
+ tz = local_timezone;
+ }
+ if (tz != current_timezone) {
+ if (tz) {
+ setenv("TZ", tz, 1);
+ } else {
+ unsetenv("TZ");
}
+ tzset();
+ current_timezone = tz;
+ }
}
void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t) {
- char *outwalk = buffer;
- struct tm tm;
+ char *outwalk = buffer;
+ struct tm tm;
- /* Convert time and format output. */
- set_timezone(tz);
- localtime_r(&t, &tm);
- outwalk += strftime(outwalk, 4095, format, &tm);
- *outwalk = '\0';
- OUTPUT_FULL_TEXT(buffer);
+ /* Convert time and format output. */
+ set_timezone(tz);
+ localtime_r(&t, &tm);
+ outwalk += strftime(outwalk, 4095, format, &tm);
+ *outwalk = '\0';
+ OUTPUT_FULL_TEXT(buffer);
}