From 3561b017ce5e2b9abeff268c4891440e83c2dd73 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 13 Apr 2004 19:27:20 +0000 Subject: [PATCH] Fix incorrect ipcalc usage text --- include/usage.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/include/usage.h b/include/usage.h index 15e60d1d3..462d09eee 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1305,29 +1305,23 @@ "\t\t\t[ label STRING ] [ scope SCOPE-ID ]\n" \ "\t\t\tSCOPE-ID := [ host | link | global | NUMBER ]" -#ifndef CONFIG_FEATURE_IPCALC_FANCY -#define ipcalc_trivial_usage \ - "[--broadcast] [--netmask] [--network] ipaddr " - -#define ipcalc_full_usage \ - "Calculate IP network settings from a IP address\n\n" \ - "Options:\n" \ - "\t-b\t--broadcast\tDisplay calculated broadcast address.\n" \ - "\t-n\t--netmask\tDisplay default netmask for IP.\n" \ - "\t-w\t--network\tDisplay calculated network address." +#ifdef CONFIG_FEATURE_IPCALC_FANCY + #define XUSAGE_IPCALC_FANCY(a) a #else + #define XUSAGE_IPCALC_FANCY(a) +#endif #define ipcalc_trivial_usage \ - "[OPTION]... ipaddr " - + "[OPTION]...
[[/]] [NETMASK]" #define ipcalc_full_usage \ "Calculate IP network settings from a IP address\n\n" \ "Options:\n" \ "\t-b\t--broadcast\tDisplay calculated broadcast address.\n" \ - "\t-n\t--netmask\tDisplay default netmask for IP.\n" \ - "\t-w\t--network\tDisplay calculated network address.\n" \ + "\t-n\t--network\tDisplay calculated network address.\n" \ + "\t-m\t--netmask\tDisplay default netmask for IP." \ + XUSAGE_IPCALC_FANCY(\ + "\n\t-p\t--prefix\tDisplay the prefix for IP/NETMASK." \ "\t-h\t--hostname\tDisplay first resolved host name.\n" \ - "\t-s\t--silent\tDon't ever display error messages." -#endif + "\t-s\t--silent\tDon't ever display error messages.") #define iplink_trivial_usage \ "{ set DEVICE { up | down | arp { on | off } | show [ DEVICE ] }"