From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 7 Jul 2021 14:39:07 +0000 (-0700)
Subject: libnetlink: cosmetic changes
X-Git-Tag: v5.14.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0015ada629a70be0139ee9a0e4d3fb6512f90f56;p=thirdparty%2Fiproute2.git

libnetlink: cosmetic changes

Don't initialize arguments that are NULL, and format initialization
in a more logical way.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index b92f10e11..5f062c7d5 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -943,12 +943,14 @@ skip_it:
 }
 
 int rtnl_dump_filter_nc(struct rtnl_handle *rth,
-		     rtnl_filter_t filter,
-		     void *arg1, __u16 nc_flags)
-{
-	const struct rtnl_dump_filter_arg a[2] = {
-		{ .filter = filter, .arg1 = arg1,
-		  .errhndlr = NULL, .arg2 = NULL, .nc_flags = nc_flags, },
+			rtnl_filter_t filter,
+			void *arg1, __u16 nc_flags)
+{
+	const struct rtnl_dump_filter_arg a[] = {
+		{
+			.filter = filter, .arg1 = arg1,
+			.nc_flags = nc_flags,
+		},
 		{ },
 	};
 
@@ -962,9 +964,12 @@ int rtnl_dump_filter_errhndlr_nc(struct rtnl_handle *rth,
 		     void *arg2,
 		     __u16 nc_flags)
 {
-	const struct rtnl_dump_filter_arg a[2] = {
-		{ .filter = filter, .arg1 = arg1,
-		  .errhndlr = errhndlr, .arg2 = arg2, .nc_flags = nc_flags, },
+	const struct rtnl_dump_filter_arg a[] = {
+		{
+			.filter = filter, .arg1 = arg1,
+			.errhndlr = errhndlr, .arg2 = arg2,
+			.nc_flags = nc_flags,
+		},
 		{ },
 	};