summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-08-18 11:08:44 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-08-19 11:52:25 +0200
commit24c0f38591578db8dbefaa76251d4461947782c9 (patch)
tree37622f33be43114b73279576ae57288feb7550f1
parentsd-netlink: constify parameters in public api and adjust pointer formatting (diff)
downloadsystemd-24c0f38591578db8dbefaa76251d4461947782c9.tar.xz
systemd-24c0f38591578db8dbefaa76251d4461947782c9.zip
sd-netlink: rename sd_netlink_message_request_dump to sd_netlink_message_set_request_dump
-rw-r--r--src/libsystemd/libsystemd.sym2
-rw-r--r--src/libsystemd/sd-netlink/netlink-message.c2
-rw-r--r--src/libsystemd/sd-netlink/test-netlink.c4
-rw-r--r--src/network/networkctl.c6
-rw-r--r--src/network/networkd-address.c2
-rw-r--r--src/network/networkd-manager.c2
-rw-r--r--src/network/networkd-speed-meter.c2
-rw-r--r--src/network/wait-online/manager.c2
-rw-r--r--src/resolve/resolvectl.c2
-rw-r--r--src/resolve/resolved-manager.c4
-rw-r--r--src/shared/local-addresses.c4
-rw-r--r--src/systemd/sd-netlink.h2
-rw-r--r--src/udev/test-udev-netlink.c2
13 files changed, 18 insertions, 18 deletions
diff --git a/src/libsystemd/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 215b6cf87f..5da9294ebe 100644
--- a/src/libsystemd/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
@@ -855,7 +855,7 @@ global:
sd_netlink_message_next;
sd_netlink_message_ref;
sd_netlink_message_unref;
- sd_netlink_message_request_dump;
+ sd_netlink_message_set_request_dump;
sd_netlink_message_is_error;
sd_netlink_message_get_errno;
sd_netlink_message_get_type;
diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index 48f962b8b5..33bec2ac9b 100644
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -113,7 +113,7 @@ int message_new_synthetic_error(sd_netlink *nl, int error, uint32_t serial, sd_n
return 0;
}
-_public_ int sd_netlink_message_request_dump(sd_netlink_message *m, int dump) {
+_public_ int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump) {
assert_return(m, -EINVAL);
assert_return(m->hdr, -EINVAL);
assert_return(m->protocol != NETLINK_ROUTE ||
diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c
index 842bcd1abf..5eda53b596 100644
--- a/src/libsystemd/sd-netlink/test-netlink.c
+++ b/src/libsystemd/sd-netlink/test-netlink.c
@@ -99,7 +99,7 @@ static void test_address_get(sd_netlink *rtnl, int ifindex) {
assert_se(sd_rtnl_message_new_addr(rtnl, &m, RTM_GETADDR, ifindex, AF_INET) >= 0);
assert_se(m);
- assert_se(sd_netlink_message_request_dump(m, true) >= 0);
+ assert_se(sd_netlink_message_set_request_dump(m, true) >= 0);
assert_se(sd_netlink_call(rtnl, m, -1, &r) == 1);
assert_se(sd_netlink_message_read_in_addr(r, IFA_LOCAL, &in_data) == 0);
@@ -480,7 +480,7 @@ static void test_get_addresses(sd_netlink *rtnl) {
log_debug("/* %s */", __func__);
assert_se(sd_rtnl_message_new_addr(rtnl, &req, RTM_GETADDR, 0, AF_UNSPEC) >= 0);
- assert_se(sd_netlink_message_request_dump(req, true) >= 0);
+ assert_se(sd_netlink_message_set_request_dump(req, true) >= 0);
assert_se(sd_netlink_call(rtnl, req, 0, &reply) >= 0);
for (m = reply; m; m = sd_netlink_message_next(m)) {
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 2f789e773a..3db2d26469 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -721,7 +721,7 @@ static int acquire_link_info(sd_bus *bus, sd_netlink *rtnl, char **patterns, Lin
if (r < 0)
return rtnl_log_create_error(r);
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return rtnl_log_create_error(r);
@@ -922,7 +922,7 @@ static int get_gateway_description(
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
@@ -1115,7 +1115,7 @@ static int dump_address_labels(sd_netlink *rtnl) {
if (r < 0)
return log_error_errno(r, "Could not allocate RTM_GETADDRLABEL message: %m");
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index ccb4a426fa..47bae041fe 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -809,7 +809,7 @@ int link_drop_ipv6ll_addresses(Link *link) {
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 52c62d7297..9c8311447b 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -739,7 +739,7 @@ static int manager_enumerate_internal(
assert(req);
assert(process);
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
diff --git a/src/network/networkd-speed-meter.c b/src/network/networkd-speed-meter.c
index 6c3f97079e..34e8614520 100644
--- a/src/network/networkd-speed-meter.c
+++ b/src/network/networkd-speed-meter.c
@@ -71,7 +71,7 @@ static int speed_meter_handler(sd_event_source *s, uint64_t usec, void *userdata
return 0;
}
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0) {
log_warning_errno(r, "Failed to set dump flag, ignoring: %m");
return 0;
diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index e5e23979ea..c98b48b06f 100644
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -284,7 +284,7 @@ static int manager_rtnl_listen(Manager *m) {
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 6d08821ecd..8e6620d604 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -1964,7 +1964,7 @@ static int status_all(sd_bus *bus, StatusMode mode) {
if (r < 0)
return rtnl_log_create_error(r);
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return rtnl_log_create_error(r);
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 7b83b91bee..0525a3b96e 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -226,7 +226,7 @@ static int manager_rtnl_listen(Manager *m) {
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
@@ -248,7 +248,7 @@ static int manager_rtnl_listen(Manager *m) {
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
diff --git a/src/shared/local-addresses.c b/src/shared/local-addresses.c
index d1f6b5df03..4d6bf9307d 100644
--- a/src/shared/local-addresses.c
+++ b/src/shared/local-addresses.c
@@ -83,7 +83,7 @@ int local_addresses(
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
@@ -236,7 +236,7 @@ int local_gateways(
if (r < 0)
return r;
- r = sd_netlink_message_request_dump(req, true);
+ r = sd_netlink_message_set_request_dump(req, true);
if (r < 0)
return r;
diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h
index a4c105a489..45c2ffb47e 100644
--- a/src/systemd/sd-netlink.h
+++ b/src/systemd/sd-netlink.h
@@ -128,7 +128,7 @@ sd_netlink_message *sd_netlink_message_next(sd_netlink_message *m);
sd_netlink_message *sd_netlink_message_ref(sd_netlink_message *m);
sd_netlink_message *sd_netlink_message_unref(sd_netlink_message *m);
-int sd_netlink_message_request_dump(sd_netlink_message *m, int dump);
+int sd_netlink_message_set_request_dump(sd_netlink_message *m, int dump);
int sd_netlink_message_is_error(sd_netlink_message *m);
int sd_netlink_message_get_errno(sd_netlink_message *m);
int sd_netlink_message_get_type(sd_netlink_message *m, uint16_t *type);
diff --git a/src/udev/test-udev-netlink.c b/src/udev/test-udev-netlink.c
index 1fddb5efb1..341414c5ef 100644
--- a/src/udev/test-udev-netlink.c
+++ b/src/udev/test-udev-netlink.c
@@ -139,7 +139,7 @@ TEST(link_info_get) {
assert_se(sd_netlink_open(&rtnl) >= 0);
assert_se(sd_rtnl_message_new_link(rtnl, &req, RTM_GETLINK, 0) >= 0);
- assert_se(sd_netlink_message_request_dump(req, true) >= 0);
+ assert_se(sd_netlink_message_set_request_dump(req, true) >= 0);
assert_se(sd_netlink_call(rtnl, req, 0, &reply) >= 0);
for (sd_netlink_message *reply_one = reply; reply_one; reply_one = sd_netlink_message_next(reply_one)) {