ipmonitor: introduce print_headers

The goal of this patch is to avoid code duplication.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 27bbe441064494b475e71443bb0219d2d8e7b66c..cae186d861530f12b9cf773c0fbc82306d446885 100644 (file)
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -37,6 +37,15 @@ static void usage(void)
        exit(-1);
 }
 
+static void print_headers(FILE *fp, char *label)
+{
+       if (timestamp)
+               print_timestamp(fp);
+
+       if (prefix_banner)
+               fprintf(fp, "%s", label);
+}
+
 static int accept_msg(const struct sockaddr_nl *who,
                      struct rtnl_ctrl_data *ctrl,
                      struct nlmsghdr *n, void *arg)
@@ -55,42 +64,31 @@ static int accept_msg(const struct sockaddr_nl *who,
                if (r->rtm_flags & RTM_F_CLONED)
                        return 0;
 
-               if (timestamp)
-                       print_timestamp(fp);
-
                if (r->rtm_family == RTNL_FAMILY_IPMR ||
                    r->rtm_family == RTNL_FAMILY_IP6MR) {
-                       if (prefix_banner)
-                               fprintf(fp, "[MROUTE]");
+                       print_headers(fp, "[MROUTE]");
                        print_mroute(who, n, arg);
                        return 0;
                } else {
-                       if (prefix_banner)
-                               fprintf(fp, "[ROUTE]");
+                       print_headers(fp, "[ROUTE]");
                        print_route(who, n, arg);
                        return 0;
                }
        }
 
-       if (timestamp)
-               print_timestamp(fp);
-
        if (n->nlmsg_type == RTM_NEWLINK || n->nlmsg_type == RTM_DELLINK) {
                ll_remember_index(who, n, NULL);
-               if (prefix_banner)
-                       fprintf(fp, "[LINK]");
+               print_headers(fp, "[LINK]");
                print_linkinfo(who, n, arg);
                return 0;
        }
        if (n->nlmsg_type == RTM_NEWADDR || n->nlmsg_type == RTM_DELADDR) {
-               if (prefix_banner)
-                       fprintf(fp, "[ADDR]");
+               print_headers(fp, "[ADDR]");
                print_addrinfo(who, n, arg);
                return 0;
        }
        if (n->nlmsg_type == RTM_NEWADDRLABEL || n->nlmsg_type == RTM_DELADDRLABEL) {
-               if (prefix_banner)
-                       fprintf(fp, "[ADDRLABEL]");
+               print_headers(fp, "[ADDRLABEL]");
                print_addrlabel(who, n, arg);
                return 0;
        }
@@ -103,26 +101,22 @@ static int accept_msg(const struct sockaddr_nl *who,
                                return 0;
                }
 
-               if (prefix_banner)
-                       fprintf(fp, "[NEIGH]");
+               print_headers(fp, "[NEIGH]");
                print_neigh(who, n, arg);
                return 0;
        }
        if (n->nlmsg_type == RTM_NEWPREFIX) {
-               if (prefix_banner)
-                       fprintf(fp, "[PREFIX]");
+               print_headers(fp, "[PREFIX]");
                print_prefix(who, n, arg);
                return 0;
        }
        if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
-               if (prefix_banner)
-                       fprintf(fp, "[RULE]");
+               print_headers(fp, "[RULE]");
                print_rule(who, n, arg);
                return 0;
        }
        if (n->nlmsg_type == RTM_NEWNETCONF) {
-               if (prefix_banner)
-                       fprintf(fp, "[NETCONF]");
+               print_headers(fp, "[NETCONF]");
                print_netconf(who, ctrl, n, arg);
                return 0;
        }
@@ -131,8 +125,7 @@ static int accept_msg(const struct sockaddr_nl *who,
                return 0;
        }
        if (n->nlmsg_type == RTM_NEWNSID || n->nlmsg_type == RTM_DELNSID) {
-               if (prefix_banner)
-                       fprintf(fp, "[NSID]");
+               print_headers(fp, "[NSID]");
                print_nsid(who, n, arg);
                return 0;
        }