iplink_bareudp: use common include syntax

[mirror_iproute2.git] / ip / link_iptnl.c

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index d4a56de40061523cd4436509c33a1be8e4d99fa7..636cdb2cf5bb7135ff4854047ea384b6b8d354f4 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -29,46 +29,39 @@ static void iptunnel_print_help(struct link_util *lu, int argc, char **argv,
 {
        const char *mode;
 
-       fprintf(f,
-               "Usage: ... %-6s [ remote ADDR ]\n",
-               lu->id
-       );
-       fprintf(f,
-               "                  [ local ADDR ]\n"
-               "                  [ ttl TTL ]\n"
-               "                  [ tos TOS ]\n"
-               "                  [ [no]pmtudisc ]\n"
-               "                  [ 6rd-prefix ADDR ]\n"
-               "                  [ 6rd-relay_prefix ADDR ]\n"
-               "                  [ 6rd-reset ]\n"
-               "                  [ dev PHYS_DEV ]\n"
-               "                  [ fwmark MARK ]\n"
-               "                  [ external ]\n"
-               "                  [ noencap ]\n"
-               "                  [ encap { fou | gue | none } ]\n"
-               "                  [ encap-sport PORT ]\n"
-               "                  [ encap-dport PORT ]\n"
-               "                  [ [no]encap-csum ]\n"
-               "                  [ [no]encap-csum6 ]\n"
-               "                  [ [no]encap-remcsum ]\n"
-       );
        if (strcmp(lu->id, "sit") == 0) {
-               mode = "{ ip6ip | ipip | mplsip | any } ]\n"
-               "                  [ isatap";
+               mode =  "{ ip6ip | ipip | mplsip | any } ]\n"
+                       "                       [ isatap";
        } else {
                mode = "{ ipip | mplsip | any }";
        }
+
        fprintf(f,
-               "                  [ mode %s ]\n"
-               "\n",
-               mode
-       );
-       fprintf(f,
-               "Where: ADDR := { IP_ADDRESS | any }\n"
-               "       TOS  := { NUMBER | inherit }\n"
-               "       TTL  := { 1..255 | inherit }\n"
-               "       MARK := { 0x0..0xffffffff }\n"
-       );
+               "Usage: ... %-6s        [ remote ADDR ]\n"
+               "                       [ local ADDR ]\n"
+               "                       [ ttl TTL ]\n"
+               "                       [ tos TOS ]\n"
+               "                       [ [no]pmtudisc ]\n"
+               "                       [ 6rd-prefix ADDR ]\n"
+               "                       [ 6rd-relay_prefix ADDR ]\n"
+               "                       [ 6rd-reset ]\n"
+               "                       [ dev PHYS_DEV ]\n"
+               "                       [ fwmark MARK ]\n"
+               "                       [ external ]\n"
+               "                       [ noencap ]\n"
+               "                       [ encap { fou | gue | none } ]\n"
+               "                       [ encap-sport PORT ]\n"
+               "                       [ encap-dport PORT ]\n"
+               "                       [ [no]encap-csum ]\n"
+               "                       [ [no]encap-csum6 ]\n"
+               "                       [ [no]encap-remcsum ]\n"
+               "                       [ mode %s ]\n"
+               "\n"
+               "Where: ADDR := { IP_ADDRESS | any }\n"
+               "       TOS  := { NUMBER | inherit }\n"
+               "       TTL  := { 1..255 | inherit }\n"
+               "       MARK := { 0x0..0xffffffff }\n",
+               lu->id, mode);
 }
 
 static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
@@ -374,7 +367,7 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
                return;
 
        if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
-               print_bool(PRINT_ANY, "external", "external", true);
+               print_bool(PRINT_ANY, "external", "external ", true);
                return;
        }