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

Merge pull request #23090 from yuwata/firewall-util-cleanups

Browse Source 
firewall-util: cleanups
This commit is contained in:
Yu Watanabe 2022-04-15 20:11:58 +09:00 committed by GitHub
commit 3e02a6a33e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-netlink/sd-netlink.c
View File

@ -270,7 +270,7 @@ int sd_netlink_sendv(
return -ENOMEM;
}
for (unsigned i = 0; i < msgcount; i++) {
for (size_t i = 0; i < msgcount; i++) {
assert_return(!messages[i]->sealed, -EPERM);
netlink_seal_message(nl, messages[i]);

13
src/shared/firewall-util-nft.c
View File

@ -29,13 +29,16 @@
#define UDP_DPORT_OFFSET 2
static int nfnl_netlink_sendv(sd_netlink *nfnl,
sd_netlink_message *messages[],
size_t msgcount) {
static int nfnl_netlink_sendv(
sd_netlink *nfnl,
sd_netlink_message **messages,
size_t msgcount) {
_cleanup_free_ uint32_t *serial = NULL;
size_t i;
int r;
assert(nfnl);
assert(messages);
assert(msgcount > 0);
r = sd_netlink_sendv(nfnl, messages, msgcount, &serial);
@ -43,7 +46,7 @@ static int nfnl_netlink_sendv(sd_netlink *nfnl,
return r;
r = 0;
for (i = 1; i < msgcount - 1; i++) {
for (size_t i = 1; i < msgcount - 1; i++) {
int tmp;
/* If message is an error, this returns embedded errno */