SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libsystemd-network: use DEFINE_POINTER_ARRAY_FREE_FUNC, rename cleanup function

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-04-10 15:08:02 +02:00
parent 954243f2bc
commit b8514cff52
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-dns-resolver.c
+2 -2
View File
@@ -299,7 +299,7 @@ int dns_resolvers_to_dot_addrs(const sd_dns_resolver *resolvers, size_t n_resolv
struct in_addr_full **addrs = NULL;
size_t n = 0;
CLEANUP_ARRAY(addrs, n, in_addr_full_array_free);
CLEANUP_ARRAY(addrs, n, in_addr_full_free_array);
FOREACH_ARRAY(res, resolvers, n_resolvers) {
if (!FLAGS_SET(res->transports, SD_DNS_ALPN_DOT))
@@ -340,7 +340,7 @@ int dns_resolvers_to_dot_strv(const sd_dns_resolver *resolvers, size_t n_resolve
struct in_addr_full **addrs = NULL;
size_t n = 0;
CLEANUP_ARRAY(addrs, n, in_addr_full_array_free);
CLEANUP_ARRAY(addrs, n, in_addr_full_free_array);
r = dns_resolvers_to_dot_addrs(resolvers, n_resolvers, &addrs, &n);
if (r < 0)
src/network/networkd-state-file.c
+3 -3
View File
@@ -136,7 +136,7 @@ static int link_put_dns(Link *link, OrderedSet **s) {
if (r >= 0) {
struct in_addr_full **dot_servers;
size_t n = 0;
CLEANUP_ARRAY(dot_servers, n, in_addr_full_array_free);
CLEANUP_ARRAY(dot_servers, n, in_addr_full_free_array);
r = dns_resolvers_to_dot_addrs(resolvers, r, &dot_servers, &n);
if (r < 0)
@@ -165,7 +165,7 @@ static int link_put_dns(Link *link, OrderedSet **s) {
if (r >= 0) {
struct in_addr_full **dot_servers;
size_t n = 0;
CLEANUP_ARRAY(dot_servers, n, in_addr_full_array_free);
CLEANUP_ARRAY(dot_servers, n, in_addr_full_free_array);
r = dns_resolvers_to_dot_addrs(resolvers, r, &dot_servers, &n);
if (r < 0)
@@ -193,7 +193,7 @@ static int link_put_dns(Link *link, OrderedSet **s) {
SET_FOREACH(a, link->ndisc_dnr) {
struct in_addr_full **dot_servers = NULL;
size_t n = 0;
CLEANUP_ARRAY(dot_servers, n, in_addr_full_array_free);
CLEANUP_ARRAY(dot_servers, n, in_addr_full_free_array);
r = dns_resolvers_to_dot_addrs(&a->resolver, 1, &dot_servers, &n);
if (r < 0)
src/network/networkd-wwan.c
+1 -1
View File
@@ -37,7 +37,7 @@ Bearer* bearer_free(Bearer *b) {
free(b->name);
free(b->apn);
in_addr_full_array_free(b->dns, b->n_dns);
in_addr_full_free_array(b->dns, b->n_dns);
return mfree(b);
}
src/shared/socket-netlink.c
+2 -9
View File
@@ -350,7 +350,7 @@ int in_addr_port_ifindex_name_from_string_auto(
return r;
}
struct in_addr_full *in_addr_full_free(struct in_addr_full *a) {
struct in_addr_full* in_addr_full_free(struct in_addr_full *a) {
if (!a)
return NULL;
@@ -359,14 +359,7 @@ struct in_addr_full *in_addr_full_free(struct in_addr_full *a) {
return mfree(a);
}
void in_addr_full_array_free(struct in_addr_full *addrs[], size_t n) {
assert(addrs || n == 0);
FOREACH_ARRAY(a, addrs, n)
in_addr_full_freep(a);
free(addrs);
}
DEFINE_POINTER_ARRAY_FREE_FUNC(struct in_addr_full*, in_addr_full_free);
int in_addr_full_new(
int family,
src/shared/socket-netlink.h
+2 -2
View File
@@ -36,9 +36,9 @@ struct in_addr_full {
char *cached_server_string; /* Should not be handled directly, but through in_addr_full_to_string(). */
};
struct in_addr_full *in_addr_full_free(struct in_addr_full *a);
struct in_addr_full* in_addr_full_free(struct in_addr_full *a);
DEFINE_TRIVIAL_CLEANUP_FUNC(struct in_addr_full*, in_addr_full_free);
void in_addr_full_array_free(struct in_addr_full *addrs[], size_t n);
void in_addr_full_free_array(struct in_addr_full **array, size_t n);
int in_addr_full_new(int family, const union in_addr_union *a, uint16_t port, int ifindex, const char *server_name, struct in_addr_full **ret);
int in_addr_full_new_from_string(const char *s, struct in_addr_full **ret);
const char* in_addr_full_to_string(struct in_addr_full *a);