From mboxrd@z Thu Jan 1 00:00:00 1970 From: Serhey Popovych Subject: [PATCH iproute2-next 0/3] ip/tunnel: Unify tunnel help message print routines Date: Thu, 8 Feb 2018 12:50:24 +0200 Message-ID: <1518087027-1291-1-git-send-email-serhe.popovych@gmail.com> To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f46.google.com ([209.85.215.46]:41862 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750865AbeBHKvQ (ORCPT ); Thu, 8 Feb 2018 05:51:16 -0500 Received: by mail-lf0-f46.google.com with SMTP id f136so5759057lff.8 for ; Thu, 08 Feb 2018 02:51:16 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id 22sm742110lju.28.2018.02.08.02.51.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 02:51:14 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: To show only relevant diffs of ip and ipv6 variants help message print routines needs to be unified and improved. Get rid of print_usage() and usage() wrappers: use single function to output help message. As side effect we return -1 from parse function instead of calling exit(2) in case of "... tunnel " is found. Additionally we get pointer to @struct link_util and can directly access ->id information to prepare customized help message. Split calls to fprintf() two group: one that contains format string with specifiers (thus requiring parameters) and another one that does not. This helps compiler to optimize calls to fprintf() with fputs() when no format specifiers in string. Do not use fputs() directly to keep code formatting nice. After this series applied following diffs: # diff -urN ip/link_gre{,6}.c # diff -urN ip/link_vti{,6}.c # diff -urN ip/link_ip{,6}tnl.c in scope of help print routines reduced to necessary minimum. Tested minimally by compiling and executing "ip link help " and "ip link add type help" commands. Looks correct. See individual patch description for more information. Reviews, commands and suggestions are welcome. Thanks, Serhii Serhey Popovych (3): vti/vti6: Unify vti_print_help() gre/gre6: Unify gre_print_help() iptnl/ip6tnl: Unify iptunnel_print_help() ip/link_gre.c | 73 ++++++++++++++++++++------------------------ ip/link_gre6.c | 74 +++++++++++++++++++++------------------------ ip/link_ip6tnl.c | 58 ++++++++++++++++++----------------- ip/link_iptnl.c | 88 ++++++++++++++++++++++++++---------------------------- ip/link_vti.c | 42 +++++++++++--------------- ip/link_vti6.c | 45 +++++++++++++--------------- 6 files changed, 178 insertions(+), 202 deletions(-) -- 1.7.10.4