diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2015-09-01 18:33:54 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@googlemail.com> | 2015-09-01 18:33:54 +0200 |
| commit | 3a487d41d79b8c24ae6e9b8e86b36bed07f2c20b (patch) | |
| tree | c5225b37b1fdb4cb66ad955f4385dc842c7fcd08 /src/basic | |
| parent | 3f010fe095a8070299d35f0f9d386672e0cb2af0 (diff) | |
| parent | 64d6c22905e94b02e760747c6c143dc9893083d9 (diff) | |
Merge pull request #1108 from phomes/dont-shadow-globals
tree-wide: do not shadow the global var timezone
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/time-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/time-util.c b/src/basic/time-util.c index afc6a6eb24..531931f6e1 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -1046,7 +1046,7 @@ clockid_t clock_boottime_or_monotonic(void) { return clock; } -int get_timezone(char **timezone) { +int get_timezone(char **tz) { _cleanup_free_ char *t = NULL; const char *e; char *z; @@ -1069,6 +1069,6 @@ int get_timezone(char **timezone) { if (!z) return -ENOMEM; - *timezone = z; + *tz = z; return 0; } |