diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-04-05 14:26:26 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-04-05 14:26:26 +0900 |
| commit | 1cc6c93a9569a9f2664d0d26cd0e50408307c430 (patch) | |
| tree | 57e115a1beb9b097f731da79c3192015ff35cc94 /src/network/networkd-address-label.c | |
| parent | 3d282fff063c81893dc4bbd0282193d20dd5357e (diff) | |
| download | systemd-1cc6c93a9569a9f2664d0d26cd0e50408307c430.tar.gz | |
tree-wide: use TAKE_PTR() and TAKE_FD() macros
Diffstat (limited to 'src/network/networkd-address-label.c')
| -rw-r--r-- | src/network/networkd-address-label.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index 4fd5fa4f58..ed360b3391 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.c @@ -36,8 +36,7 @@ int address_label_new(AddressLabel **ret) { if (!addrlabel) return -ENOMEM; - *ret = addrlabel; - addrlabel = NULL; + *ret = TAKE_PTR(addrlabel); return 0; } @@ -75,8 +74,7 @@ static int address_label_new_static(Network *network, const char *filename, unsi label = hashmap_get(network->address_labels_by_section, n); if (label) { - *ret = label; - label = NULL; + *ret = TAKE_PTR(label); return 0; } @@ -85,8 +83,7 @@ static int address_label_new_static(Network *network, const char *filename, unsi if (r < 0) return r; - label->section = n; - n = NULL; + label->section = TAKE_PTR(n); r = hashmap_put(network->address_labels_by_section, label->section, label); if (r < 0) @@ -96,8 +93,7 @@ static int address_label_new_static(Network *network, const char *filename, unsi LIST_APPEND(labels, network->address_labels, label); network->n_address_labels++; - *ret = label; - label = NULL; + *ret = TAKE_PTR(label); return 0; } |