From: Justin Iurman <justin.iurman@uliege.be>
Date: Wed, 11 Aug 2021 10:13:56 +0000 (+0200)
Subject: ipioam6: use print_nl instead of print_null
X-Git-Tag: v5.15.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df8912ede29c0fd812da1b8dcfdbb109dcd0af18;p=thirdparty%2Fiproute2.git

ipioam6: use print_nl instead of print_null

This patch addresses Stephen's comment:

"""
> +        print_null(PRINT_ANY, "", "\n", NULL);

Use print_nl() since it handles the case of oneline output.
Plus in JSON the newline is meaningless.
"""

It also removes two useless print_null's.

Signed-off-by: Justin Iurman <justin.iurman@uliege.be>
Signed-off-by: David Ahern <dsahern@kernel.org>
---

diff --git a/ip/ipioam6.c b/ip/ipioam6.c
index 253d0b663..b63d7d5c9 100644
--- a/ip/ipioam6.c
+++ b/ip/ipioam6.c
@@ -62,19 +62,15 @@ static void print_namespace(struct rtattr *attrs[])
 		print_uint(PRINT_ANY, "schema", " [schema %u]",
 			   rta_getattr_u32(attrs[IOAM6_ATTR_SC_ID]));
 
-	if (!attrs[IOAM6_ATTR_NS_DATA])
-		print_null(PRINT_ANY, "data", "", NULL);
-	else
+	if (attrs[IOAM6_ATTR_NS_DATA])
 		print_hex(PRINT_ANY, "data", ", data %#010x",
 			  rta_getattr_u32(attrs[IOAM6_ATTR_NS_DATA]));
 
-	if (!attrs[IOAM6_ATTR_NS_DATA_WIDE])
-		print_null(PRINT_ANY, "wide", "", NULL);
-	else
+	if (attrs[IOAM6_ATTR_NS_DATA_WIDE])
 		print_0xhex(PRINT_ANY, "wide", ", wide %#018lx",
 			    rta_getattr_u64(attrs[IOAM6_ATTR_NS_DATA_WIDE]));
 
-	print_null(PRINT_ANY, "", "\n", NULL);
+	print_nl();
 }
 
 static void print_schema(struct rtattr *attrs[])
@@ -97,7 +93,7 @@ static void print_schema(struct rtattr *attrs[])
 		print_hhu(PRINT_ANY, "", " %02x", data[i]);
 		i++;
 	}
-	print_null(PRINT_ANY, "", "\n", NULL);
+	print_nl();
 }
 
 static int process_msg(struct nlmsghdr *n, void *arg)