picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

local-addresses: make returning accumulated list optional

This commit is contained in:
Lennart Poettering 2020-11-06 10:26:40 +01:00
parent 6c0bacc146
commit c3a8c6aa42
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/local-addresses.c
View File

@ -41,8 +41,6 @@ int local_addresses(sd_netlink *context, int ifindex, int af, struct local_addre
sd_netlink_message *m;
int r;
assert(ret);
if (context)
rtnl = sd_netlink_ref(context);
else {
@ -135,9 +133,10 @@ int local_addresses(sd_netlink *context, int ifindex, int af, struct local_addre
n_list++;
};
typesafe_qsort(list, n_list, address_compare);
*ret = TAKE_PTR(list);
if (ret) {
typesafe_qsort(list, n_list, address_compare);
*ret = TAKE_PTR(list);
}
return (int) n_list;
}
@ -179,8 +178,6 @@ int local_gateways(sd_netlink *context, int ifindex, int af, struct local_addres
size_t n_list = 0, n_allocated = 0;
int r;
assert(ret);
if (context)
rtnl = sd_netlink_ref(context);
else {
@ -309,9 +306,10 @@ int local_gateways(sd_netlink *context, int ifindex, int af, struct local_addres
}
}
typesafe_qsort(list, n_list, address_compare);
*ret = TAKE_PTR(list);
if (ret) {
typesafe_qsort(list, n_list, address_compare);
*ret = TAKE_PTR(list);
}
return (int) n_list;
}