Skip to content

Commit 483d099

Browse files
keszybzkeszybz
committed
tree-wide: drop spurious "&"s when passing functions around
Also adjust indentation in various places.
1 parent d9d9439 commit 483d099

File tree

7 files changed

+31
-28
lines changed

7 files changed

+31
-28
lines changed

‎src/libsystemd-network/sd-dhcp6-client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,16 +1196,16 @@ int sd_dhcp6_client_start(sd_dhcp6_client *client) {
11961196
goto error;
11971197

11981198
r = sd_event_source_set_description(client->receive_message,
1199-
"dhcp6-receive-message");
1199+
"dhcp6-receive-message");
12001200
if (r < 0)
12011201
goto error;
12021202

12031203
if (client->information_request)
12041204
state = DHCP6_STATE_INFORMATION_REQUEST;
12051205

12061206
log_dhcp6_client(client, "Started in %s mode",
1207-
client->information_request? "Information request":
1208-
"Managed");
1207+
client->information_request? "Information request":
1208+
"Managed");
12091209

12101210
return client_start(client, state);
12111211

‎src/libsystemd/sd-netlink/test-netlink.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ static void test_event_loop(int ifindex) {
217217
assert_se(sd_netlink_open(&rtnl) >= 0);
218218
assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_GETLINK, ifindex) >= 0);
219219

220-
assert_se(sd_netlink_call_async(rtnl, m, &link_handler, ifname, 0, NULL) >= 0);
220+
assert_se(sd_netlink_call_async(rtnl, m, link_handler, ifname, 0, NULL) >= 0);
221221

222222
assert_se(sd_event_default(&event) >= 0);
223223

@@ -258,7 +258,7 @@ static void test_async(int ifindex) {
258258

259259
assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_GETLINK, ifindex) >= 0);
260260

261-
assert_se(sd_netlink_call_async(rtnl, m, &link_handler, ifname, 0, &serial) >= 0);
261+
assert_se(sd_netlink_call_async(rtnl, m, link_handler, ifname, 0, &serial) >= 0);
262262

263263
assert_se(sd_netlink_wait(rtnl, 0) >= 0);
264264
assert_se(sd_netlink_process(rtnl, &r) >= 0);
@@ -277,10 +277,10 @@ static void test_pipe(int ifindex) {
277277
assert_se(sd_rtnl_message_new_link(rtnl, &m2, RTM_GETLINK, ifindex) >= 0);
278278

279279
counter++;
280-
assert_se(sd_netlink_call_async(rtnl, m1, &pipe_handler, &counter, 0, NULL) >= 0);
280+
assert_se(sd_netlink_call_async(rtnl, m1, pipe_handler, &counter, 0, NULL) >= 0);
281281

282282
counter++;
283-
assert_se(sd_netlink_call_async(rtnl, m2, &pipe_handler, &counter, 0, NULL) >= 0);
283+
assert_se(sd_netlink_call_async(rtnl, m2, pipe_handler, &counter, 0, NULL) >= 0);
284284

285285
while (counter > 0) {
286286
assert_se(sd_netlink_wait(rtnl, 0) >= 0);
@@ -330,12 +330,12 @@ static void test_match(void) {
330330

331331
assert_se(sd_netlink_open(&rtnl) >= 0);
332332

333-
assert_se(sd_netlink_add_match(rtnl, RTM_NEWLINK, &link_handler, NULL) >= 0);
334-
assert_se(sd_netlink_add_match(rtnl, RTM_NEWLINK, &link_handler, NULL) >= 0);
333+
assert_se(sd_netlink_add_match(rtnl, RTM_NEWLINK, link_handler, NULL) >= 0);
334+
assert_se(sd_netlink_add_match(rtnl, RTM_NEWLINK, link_handler, NULL) >= 0);
335335

336-
assert_se(sd_netlink_remove_match(rtnl, RTM_NEWLINK, &link_handler, NULL) == 1);
337-
assert_se(sd_netlink_remove_match(rtnl, RTM_NEWLINK, &link_handler, NULL) == 1);
338-
assert_se(sd_netlink_remove_match(rtnl, RTM_NEWLINK, &link_handler, NULL) == 0);
336+
assert_se(sd_netlink_remove_match(rtnl, RTM_NEWLINK, link_handler, NULL) == 1);
337+
assert_se(sd_netlink_remove_match(rtnl, RTM_NEWLINK, link_handler, NULL) == 1);
338+
assert_se(sd_netlink_remove_match(rtnl, RTM_NEWLINK, link_handler, NULL) == 0);
339339

340340
assert_se((rtnl = sd_netlink_unref(rtnl)) == NULL);
341341
}

‎src/network/networkd-address.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,11 @@ int address_get(Link *link, int family, const union in_addr_union *in_addr, unsi
404404
return 0;
405405
}
406406

407-
int address_remove(Address *address, Link *link,
408-
sd_netlink_message_handler_t callback) {
407+
int address_remove(
408+
Address *address,
409+
Link *link,
410+
sd_netlink_message_handler_t callback) {
411+
409412
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
410413
int r;
411414

‎src/network/networkd-dhcp4.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static int link_set_dhcp_routes(Link *link) {
9696
route_gw->protocol = RTPROT_DHCP;
9797
route_gw->priority = link->network->dhcp_route_metric;
9898

99-
r = route_configure(route_gw, link, &dhcp4_route_handler);
99+
r = route_configure(route_gw, link, dhcp4_route_handler);
100100
if (r < 0)
101101
return log_link_warning_errno(link, r, "Could not set host route: %m");
102102

@@ -107,7 +107,7 @@ static int link_set_dhcp_routes(Link *link) {
107107
route->prefsrc.in = address;
108108
route->priority = link->network->dhcp_route_metric;
109109

110-
r = route_configure(route, link, &dhcp4_route_handler);
110+
r = route_configure(route, link, dhcp4_route_handler);
111111
if (r < 0) {
112112
log_link_warning_errno(link, r, "Could not set routes: %m");
113113
link_enter_failed(link);
@@ -137,7 +137,7 @@ static int link_set_dhcp_routes(Link *link) {
137137
assert_se(sd_dhcp_route_get_destination_prefix_length(static_routes[i], &route->dst_prefixlen) >= 0);
138138
route->priority = link->network->dhcp_route_metric;
139139

140-
r = route_configure(route, link, &dhcp4_route_handler);
140+
r = route_configure(route, link, dhcp4_route_handler);
141141
if (r < 0)
142142
return log_link_warning_errno(link, r, "Could not set host route: %m");
143143

@@ -177,7 +177,7 @@ static int dhcp_lease_lost(Link *link) {
177177
assert_se(sd_dhcp_route_get_destination_prefix_length(routes[i], &route->dst_prefixlen) >= 0);
178178

179179
route_remove(route, link,
180-
&link_route_remove_handler);
180+
link_route_remove_handler);
181181
}
182182
}
183183
}
@@ -198,7 +198,7 @@ static int dhcp_lease_lost(Link *link) {
198198
route_gw->scope = RT_SCOPE_LINK;
199199

200200
route_remove(route_gw, link,
201-
&link_route_remove_handler);
201+
link_route_remove_handler);
202202
}
203203

204204
r = route_new(&route);
@@ -207,7 +207,7 @@ static int dhcp_lease_lost(Link *link) {
207207
route->gw.in = gateway;
208208

209209
route_remove(route, link,
210-
&link_route_remove_handler);
210+
link_route_remove_handler);
211211
}
212212
}
213213

@@ -221,7 +221,7 @@ static int dhcp_lease_lost(Link *link) {
221221
address->in_addr.in = addr;
222222
address->prefixlen = prefixlen;
223223

224-
address_remove(address, link, &link_address_remove_handler);
224+
address_remove(address, link, link_address_remove_handler);
225225
}
226226
}
227227

@@ -309,7 +309,7 @@ static int dhcp4_update_address(Link *link,
309309

310310
/* allow reusing an existing address and simply update its lifetime
311311
* in case it already exists */
312-
r = address_configure(addr, link, &dhcp4_address_handler, true);
312+
r = address_configure(addr, link, dhcp4_address_handler, true);
313313
if (r < 0)
314314
return r;
315315

‎src/network/networkd-dhcp6.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link) {
103103
sd_dhcp6_lease_reset_address_iter(lease);
104104

105105
while (sd_dhcp6_lease_get_address(lease, &ip6_addr,
106-
&lifetime_preferred,
107-
&lifetime_valid) >= 0) {
106+
&lifetime_preferred,
107+
&lifetime_valid) >= 0) {
108108

109109
r = dhcp6_address_change(link, &ip6_addr, lifetime_preferred, lifetime_valid);
110110
if (r < 0)

‎src/network/networkd-ipv4ll.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int ipv4ll_address_lost(Link *link) {
5151
address->prefixlen = 16;
5252
address->scope = RT_SCOPE_LINK;
5353

54-
address_remove(address, link, &link_address_remove_handler);
54+
address_remove(address, link, link_address_remove_handler);
5555

5656
r = route_new(&route);
5757
if (r < 0) {
@@ -63,7 +63,7 @@ static int ipv4ll_address_lost(Link *link) {
6363
route->scope = RT_SCOPE_LINK;
6464
route->priority = IPV4LL_ROUTE_METRIC;
6565

66-
route_remove(route, link, &link_route_remove_handler);
66+
route_remove(route, link, link_route_remove_handler);
6767

6868
link_check_ready(link);
6969

‎src/network/networkd-link.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ static int link_enter_set_routes(Link *link) {
760760
link_set_state(link, LINK_STATE_SETTING_ROUTES);
761761

762762
LIST_FOREACH(routes, rt, link->network->static_routes) {
763-
r = route_configure(rt, link, &route_handler);
763+
r = route_configure(rt, link, route_handler);
764764
if (r < 0) {
765765
log_link_warning_errno(link, r, "Could not set routes: %m");
766766
link_enter_failed(link);
@@ -929,7 +929,7 @@ static int link_enter_set_addresses(Link *link) {
929929
link_set_state(link, LINK_STATE_SETTING_ADDRESSES);
930930

931931
LIST_FOREACH(addresses, ad, link->network->static_addresses) {
932-
r = address_configure(ad, link, &address_handler, false);
932+
r = address_configure(ad, link, address_handler, false);
933933
if (r < 0) {
934934
log_link_warning_errno(link, r, "Could not set addresses: %m");
935935
link_enter_failed(link);

0 commit comments

Comments
 (0)