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/networkd-network.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/networkd-network.c')
| -rw-r--r-- | src/network/networkd-network.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 2a77242013..ee14401982 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -786,7 +786,7 @@ int config_parse_timezone( void *data, void *userdata) { - char **timezone = data, *tz = NULL; + char **datap = data, *tz = NULL; int r; assert(filename); @@ -803,8 +803,8 @@ int config_parse_timezone( return 0; } - free(*timezone); - *timezone = tz; + free(*datap); + *datap = tz; return 0; } |