Merge pull request #1108 from phomes/dont-shadow-globals

tree-wide: do not shadow the global var timezone
2015-09-01 18:33:54 +02:00
parent 3f010fe095 64d6c22905
commit 3a487d41d7
6 changed files with 20 additions and 20 deletions
@@ -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;
 }