From 92e981d325deccc182aa58d05b2fef7bbdbd427b Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 19 Oct 2023 10:28:32 -0400 Subject: [PATCH] MT#57371 change scope of temporary object We can use this to return information back to the calling function. Change-Id: I8c83d41145e8f1e4d51b8b3b28cbd20abd63829b --- daemon/nftables.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/nftables.c b/daemon/nftables.c index 015a7d097..202734e23 100644 --- a/daemon/nftables.c +++ b/daemon/nftables.c @@ -167,7 +167,7 @@ static const char *__read_response(struct mnl_socket *nl, uint32_t seq, mnl_cb_t static const char *iterate_rules(struct mnl_socket *nl, int family, const char *chain, uint32_t *seq, - struct iterate_callbacks callbacks) + struct iterate_callbacks *callbacks) { AUTO_CLEANUP(struct nftnl_rule *r, rule_free) = nftnl_rule_alloc(); if (!r) @@ -186,11 +186,11 @@ static const char *iterate_rules(struct mnl_socket *nl, int family, const char * if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) return "failed to write to netlink socket for iteration"; - const char *err = read_response("iterate rules", nl, *seq, nftables_do_rule, &callbacks); + const char *err = read_response("iterate rules", nl, *seq, nftables_do_rule, callbacks); if (err) return err; - err = callbacks.iterate_final(nl, family, chain, seq, &callbacks); + err = callbacks->iterate_final(nl, family, chain, seq, callbacks); if (err) return err; @@ -474,7 +474,7 @@ static const char *nftables_shutdown_family(struct mnl_socket *nl, int family, u { // clean up rules in legacy `INPUT` chain const char *err = iterate_rules(nl, family, "INPUT", seq, - (struct iterate_callbacks) { + &(struct iterate_callbacks) { .parse_expr = match_immediate_rtpe, .chain = chain, .rule_final = check_immediate, @@ -485,7 +485,7 @@ static const char *nftables_shutdown_family(struct mnl_socket *nl, int family, u // clean up rules in `input` chain err = iterate_rules(nl, family, "input", seq, - (struct iterate_callbacks) { + &(struct iterate_callbacks) { .parse_expr = match_immediate_rtpe, .chain = chain, .rule_final = check_immediate, @@ -497,7 +497,7 @@ static const char *nftables_shutdown_family(struct mnl_socket *nl, int family, u if (base_chain && strcmp(base_chain, "none")) { // clean up rules in other base chain chain if any err = iterate_rules(nl, family, base_chain, seq, - (struct iterate_callbacks) { + &(struct iterate_callbacks) { .parse_expr = match_immediate_rtpe, .chain = chain, .rule_final = check_immediate,