]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: use free_and_replace()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 2 Aug 2018 07:28:44 +0000 (16:28 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 6 Aug 2018 01:46:05 +0000 (10:46 +0900)
src/network/networkd-network.c

index eb13e9e93dab5297bcb2811c49edb6e272432e6a..c8f7c4f98a57b3b60c5499171e7a66a17175e655 100644 (file)
@@ -1013,7 +1013,8 @@ int config_parse_timezone(
                 void *data,
                 void *userdata) {
 
-        char **datap = data, *tz = NULL;
+        _cleanup_free_ char *tz = NULL;
+        char **datap = data;
         int r;
 
         assert(filename);
@@ -1026,14 +1027,10 @@ int config_parse_timezone(
 
         if (!timezone_is_valid(tz, LOG_ERR)) {
                 log_syntax(unit, LOG_ERR, filename, line, 0, "Timezone is not valid, ignoring assignment: %s", rvalue);
-                free(tz);
                 return 0;
         }
 
-        free(*datap);
-        *datap = tz;
-
-        return 0;
+        return free_and_replace(*datap, tz);
 }
 
 int config_parse_dhcp_server_dns(