From a36e0ae05b37cb2055bd2a4304d43b486888d5a7 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 24 Feb 2016 10:49:04 +0100 Subject: [PATCH] iplink: use the short format to print help info Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1270759 Upstream Status: iproute2.git commit 43367ef7eb047 commit 43367ef7eb0473ea4ecdc3925f076107f05873a0 Author: Zhang Shengju Date: Wed Aug 12 06:03:23 2015 +0000 iplink: use the short format to print help info Allow to print link type usage by: ip link help bridge Signed-off-by: Zhang Shengju --- ip/iplink_bridge.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 297160c..1e69960 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -17,9 +17,9 @@ #include "utils.h" #include "ip_common.h" -static void explain(void) +static void print_explain(FILE *f) { - fprintf(stderr, + fprintf(f, "Usage: ... bridge [ forward_delay FORWARD_DELAY ]\n" " [ hello_time HELLO_TIME ]\n" " [ max_age MAX_AGE ]\n" @@ -29,6 +29,11 @@ static void explain(void) ); } +static void explain(void) +{ + print_explain(stderr); +} + static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, struct nlmsghdr *n) { @@ -111,9 +116,16 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) rta_getattr_u32(tb[IFLA_BR_MAX_AGE])); } +static void bridge_print_help(struct link_util *lu, int argc, char **argv, + FILE *f) +{ + print_explain(f); +} + struct link_util bridge_link_util = { .id = "bridge", .maxattr = IFLA_BR_MAX, .parse_opt = bridge_parse_opt, .print_opt = bridge_print_opt, + .print_help = bridge_print_help, }; -- 1.8.3.1