[PATCH] selftests: netfilter: remove unused rplnlh parameter

Liu Jing posted 1 patch 1 month, 1 week ago
tools/testing/selftests/net/netfilter/conntrack_dump_flush.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
[PATCH] selftests: netfilter: remove unused rplnlh parameter
Posted by Liu Jing 1 month, 1 week ago
The rplnlh parameter is not used in many functions, so delete it.

Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com>
---
 tools/testing/selftests/net/netfilter/conntrack_dump_flush.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
index bd9317bf5ada..e03ddc60b5d4 100644
--- a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
+++ b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
@@ -96,7 +96,6 @@ static int conntrack_data_insert(struct mnl_socket *sock, struct nlmsghdr *nlh,
 				 uint16_t zone)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
-	struct nlmsghdr *rplnlh;
 	unsigned int portid;
 	int err, ret;
 
@@ -212,7 +211,7 @@ static int count_entries(const struct nlmsghdr *nlh, void *data)
 static int conntracK_count_zone(struct mnl_socket *sock, uint16_t zone)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
-	struct nlmsghdr *nlh, *rplnlh;
+	struct nlmsghdr *nlh;
 	struct nfgenmsg *nfh;
 	struct nlattr *nest;
 	unsigned int portid;
@@ -259,7 +258,7 @@ static int conntracK_count_zone(struct mnl_socket *sock, uint16_t zone)
 static int conntrack_flush_zone(struct mnl_socket *sock, uint16_t zone)
 {
 	char buf[MNL_SOCKET_BUFFER_SIZE];
-	struct nlmsghdr *nlh, *rplnlh;
+	struct nlmsghdr *nlh;
 	struct nfgenmsg *nfh;
 	struct nlattr *nest;
 	unsigned int portid;
-- 
2.27.0
Re: [PATCH] selftests: netfilter: remove unused rplnlh parameter
Posted by Antoine Tenart 1 month, 1 week ago
Quoting Liu Jing (2024-10-17 09:25:34)
> The rplnlh parameter is not used in many functions, so delete it.
> 
> Signed-off-by: Liu Jing <liujing@cmss.chinamobile.com>
> ---
>  tools/testing/selftests/net/netfilter/conntrack_dump_flush.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
> index bd9317bf5ada..e03ddc60b5d4 100644
> --- a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
> +++ b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
> @@ -96,7 +96,6 @@ static int conntrack_data_insert(struct mnl_socket *sock, struct nlmsghdr *nlh,
>                                  uint16_t zone)
>  {
>         char buf[MNL_SOCKET_BUFFER_SIZE];
> -       struct nlmsghdr *rplnlh;
>         unsigned int portid;
>         int err, ret;

While at it, it seems 'err' is not used as well. In the two other
functions as well.

Thanks!
Antoine

> @@ -212,7 +211,7 @@ static int count_entries(const struct nlmsghdr *nlh, void *data)
>  static int conntracK_count_zone(struct mnl_socket *sock, uint16_t zone)
>  {
>         char buf[MNL_SOCKET_BUFFER_SIZE];
> -       struct nlmsghdr *nlh, *rplnlh;
> +       struct nlmsghdr *nlh;
>         struct nfgenmsg *nfh;
>         struct nlattr *nest;
>         unsigned int portid;
> @@ -259,7 +258,7 @@ static int conntracK_count_zone(struct mnl_socket *sock, uint16_t zone)
>  static int conntrack_flush_zone(struct mnl_socket *sock, uint16_t zone)
>  {
>         char buf[MNL_SOCKET_BUFFER_SIZE];
> -       struct nlmsghdr *nlh, *rplnlh;
> +       struct nlmsghdr *nlh;
>         struct nfgenmsg *nfh;
>         struct nlattr *nest;
>         unsigned int portid;