ip, neigh: Fix up spacing in netlink dump

Fix up spacing to consistently add a single ' ' after an attribute has
been printed. Currently, it is a bit of a mix of before and after which
can lead to double spacing to be printed.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/ip/ipneigh.c b/ip/ipneigh.c
index 9c20d4ad92fb87f3ecd3ccebb8cd0e8178b5ba21..a8006f94ab87243d34138ec244f415aa3afd1e83 100644 (file)
--- a/ip/ipneigh.c
+++ b/ip/ipneigh.c
@@ -235,7 +235,7 @@ static void print_neigh_state(unsigned int nud)
 #define PRINT_FLAG(f)                                          \
        if (nud & NUD_##f) {                                    \
                nud &= ~NUD_##f;                                \
-               print_string(PRINT_ANY, NULL, " %s", #f);       \
+               print_string(PRINT_ANY, NULL, "%s ", #f);       \
        }
 
        PRINT_FLAG(INCOMPLETE);
@@ -423,27 +423,27 @@ int print_neigh(struct nlmsghdr *n, void *arg)
                        fprintf(fp, "lladdr ");
 
                print_color_string(PRINT_ANY, COLOR_MAC,
-                                  "lladdr", "%s", lladdr);
+                                  "lladdr", "%s ", lladdr);
        }
 
        if (r->ndm_flags & NTF_ROUTER)
-               print_null(PRINT_ANY, "router", " %s", "router");
+               print_null(PRINT_ANY, "router", "%s ", "router");
 
        if (r->ndm_flags & NTF_PROXY)
-               print_null(PRINT_ANY, "proxy", " %s", "proxy");
+               print_null(PRINT_ANY, "proxy", "%s ", "proxy");
 
        if (r->ndm_flags & NTF_EXT_LEARNED)
-               print_null(PRINT_ANY, "extern_learn", " %s ", "extern_learn");
+               print_null(PRINT_ANY, "extern_learn", "%s ", "extern_learn");
 
        if (r->ndm_flags & NTF_OFFLOADED)
-               print_null(PRINT_ANY, "offload", " %s", "offload");
+               print_null(PRINT_ANY, "offload", "%s ", "offload");
 
        if (show_stats) {
                if (tb[NDA_CACHEINFO])
                        print_cacheinfo(RTA_DATA(tb[NDA_CACHEINFO]));
 
                if (tb[NDA_PROBES])
-                       print_uint(PRINT_ANY, "probes", " probes %u",
+                       print_uint(PRINT_ANY, "probes", "probes %u ",
                                   rta_getattr_u32(tb[NDA_PROBES]));
        }
 
@@ -453,7 +453,7 @@ int print_neigh(struct nlmsghdr *n, void *arg)
        if (protocol) {
                SPRINT_BUF(b1);
 
-               print_string(PRINT_ANY, "protocol", " proto %s ",
+               print_string(PRINT_ANY, "protocol", "proto %s ",
                             rtnl_rtprot_n2a(protocol, b1, sizeof(b1)));
        }