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/network/networkctl.c | |
| 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/network/networkctl.c')
| -rw-r--r-- | src/network/networkctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 2281d4b718..786579def0 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -497,7 +497,7 @@ static int link_status_one( sd_hwdb *hwdb, const char *name) { _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL; - _cleanup_free_ char *setup_state = NULL, *operational_state = NULL, *timezone = NULL; + _cleanup_free_ char *setup_state = NULL, *operational_state = NULL, *tz = NULL; _cleanup_netlink_message_unref_ sd_netlink_message *req = NULL, *reply = NULL; _cleanup_device_unref_ sd_device *d = NULL; char devid[2 + DECIMAL_STR_MAX(int)]; @@ -662,9 +662,9 @@ static int link_status_one( if (!strv_isempty(carrier_bound_by)) dump_list("Carrier Bound By: ", carrier_bound_by); - (void) sd_network_link_get_timezone(ifindex, &timezone); - if (timezone) - printf(" Time Zone: %s", timezone); + (void) sd_network_link_get_timezone(ifindex, &tz); + if (tz) + printf(" Time Zone: %s", tz); return 0; } |