From 19727828d22057e9eb9160cae879ed5ced708517 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 19 Dec 2014 08:33:46 +0100 Subject: networkctl: lldp - respect arg_legend --- src/network/networkctl.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 74735effcc..21e9b383b2 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -927,11 +927,8 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { if (c < 0) return rtnl_log_parse_error(c); - printf("Capability Codes: (O) - Other, (P) - Repeater, (B) - Bridge , (W) - WLAN Access Point, (R) = Router, (T) - Telephone,\n" - "(D) - Data Over Cable Service Interface Specifications, (A) - Station, (C) - Customer VLAN, (S) - Service VLAN,\n" - "(M) - Two-port MAC Relay (TPMR)\n\n"); - - printf("%s %16s %24s %16s %16s\n", "Local Intf", "Device ID", "Port ID", "TTL", "Capability"); + if (arg_legend) + printf("%s %16s %24s %16s %16s\n", "Local Intf", "Device ID", "Port ID", "TTL", "Capability"); for (i = j = 0; i < c; i++) { _cleanup_free_ char *chassis = NULL, *port = NULL, *cap = NULL, *lldp = NULL; @@ -995,7 +992,14 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { } } - printf("\nTotal entries displayed: %d\n", j); + if (arg_legend) { + printf("\nCapability Codes:\n" + "(O) - Other, (P) - Repeater, (B) - Bridge , (W) - WLAN Access Point, (R) = Router,\n" + "(T) - Telephone, (D) - Data Over Cable Service Interface Specifications, (A) - Station,\n" + "(C) - Customer VLAN, (S) - Service VLAN, (M) - Two-port MAC Relay (TPMR)\n\n"); + + printf("Total entries displayed: %d\n", j); + } return 0; } -- cgit v1.2.3-54-g00ecf