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/libsystemd-network/sd-dhcp-server.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/libsystemd-network/sd-dhcp-server.c')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index 7a8b298b51..1f167485e3 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -1062,16 +1062,16 @@ int sd_dhcp_server_forcerenew(sd_dhcp_server *server) { return r; } -int sd_dhcp_server_set_timezone(sd_dhcp_server *server, const char *timezone) { +int sd_dhcp_server_set_timezone(sd_dhcp_server *server, const char *tz) { int r; assert_return(server, -EINVAL); - assert_return(timezone_is_valid(timezone), -EINVAL); + assert_return(timezone_is_valid(tz), -EINVAL); - if (streq_ptr(timezone, server->timezone)) + if (streq_ptr(tz, server->timezone)) return 0; - r = free_and_strdup(&server->timezone, timezone); + r = free_and_strdup(&server->timezone, tz); if (r < 0) return r; |