shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

local-addresses: always sort and dedup even if addresses are not requested

Browse Source 
Otherwise, the return value may different when ret is NULL or not.
This commit is contained in:
Yu Watanabe 2024-01-19 19:47:29 +09:00
parent e90863f231
commit a64f60416c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,11 +168,11 @@ int local_addresses(
n_list++;
};
if (ret) {
typesafe_qsort(list, n_list, address_compare);
suppress_duplicates(list, &n_list);
typesafe_qsort(list, n_list, address_compare);
suppress_duplicates(list, &n_list);
if (ret)
*ret = TAKE_PTR(list);
}
return (int) n_list;
}
@ -370,11 +370,11 @@ int local_gateways(
}
}
if (ret) {
typesafe_qsort(list, n_list, address_compare);
suppress_duplicates(list, &n_list);
typesafe_qsort(list, n_list, address_compare);
suppress_duplicates(list, &n_list);
if (ret)
*ret = TAKE_PTR(list);
}
return (int) n_list;
}
@ -515,11 +515,11 @@ int local_outbounds(
}
}
if (ret) {
typesafe_qsort(list, n_list, address_compare);
suppress_duplicates(list, &n_list);
typesafe_qsort(list, n_list, address_compare);
suppress_duplicates(list, &n_list);
if (ret)
*ret = TAKE_PTR(list);
}
return (int) n_list;
}