summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-24 12:00:07 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-10-24 12:00:07 +0200
commit9b08c804ef5197ab29f0ef1d96e589ed9c018019 (patch)
treeb3f0c7da7a31ab457fc31e2cb43672107a70db11
parentde157fe2a76024ce513d646ca76a661d4b0588b2 (diff)
downloadsystemd-9b08c804ef5197ab29f0ef1d96e589ed9c018019.tar.gz
sd-dhcp-client: remove unnecessary cleanup function
https://github.com/systemd/systemd/pull/13663#discussion_r335327099
-rw-r--r--src/libsystemd-network/sd-dhcp-client.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 550f614d0c..9652f70cc0 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -548,16 +548,13 @@ static sd_dhcp_option* dhcp_option_free(sd_dhcp_option *i) {
}
int sd_dhcp_option_new(uint8_t option, void *data, size_t length, sd_dhcp_option **ret) {
- _cleanup_(sd_dhcp_option_unrefp) sd_dhcp_option *p = NULL;
- _cleanup_free_ void *q = NULL;
-
assert(ret);
- q = memdup(data, length);
+ _cleanup_free_ void *q = memdup(data, length);
if (!q)
return -ENOMEM;
- p = new(sd_dhcp_option, 1);
+ sd_dhcp_option *p = new(sd_dhcp_option, 1);
if (!p)
return -ENOMEM;