commit 88478bbc603222965b9f617acccb0d7ba409ac3b
author Fangrui Song <maskray@google.com> Wed Oct 10 00:15:31 2018 +0000
committer Fangrui Song <maskray@google.com> Wed Oct 10 00:15:31 2018 +0000
tree 75f01daa0d6fc3e928dbb7fb257aabd38266a5dc
parent 7f208f02dbea6225db15dbdbf0e8d4778cc36fc5

[opt] Change the parameter of OptTable::PrintHelp from Name to Usage and don't append "[options] <inputs>"

Summary:
Before, "[options] <inputs>" is unconditionally appended to the `Name` parameter. It is more flexible to change its semantic to `Usage` and let user customize the usage line.

% llvm-objcopy
...
USAGE: llvm-objcopy <input> [ <output> ] [options] <inputs>

With this patch:

% llvm-objcopy
...
USAGE: llvm-objcopy input [output]

Reviewers: rupprecht, alexshap, jhenderson

Reviewed By: rupprecht

Subscribers: jakehehrlich, mehdi_amini, steven_wu, dexonsmith, llvm-commits

Differential Revision: https://reviews.llvm.org/D51009

llvm-svn: 344097

llvm/tools/llvm-objcopy/llvm-objcopy.cpp

diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
index 345a11d..3e494f9 100644
--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -897,12 +897,12 @@
       T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
 
   if (InputArgs.size() == 0) {
-    T.PrintHelp(errs(), "llvm-objcopy <input> [ <output> ]", "objcopy tool");
+    T.PrintHelp(errs(), "llvm-objcopy input [output]", "objcopy tool");
     exit(1);
   }
 
   if (InputArgs.hasArg(OBJCOPY_help)) {
-    T.PrintHelp(outs(), "llvm-objcopy <input> [ <output> ]", "objcopy tool");
+    T.PrintHelp(outs(), "llvm-objcopy input [output]", "objcopy tool");
     exit(0);
   }
 
@@ -1039,13 +1039,14 @@
   llvm::opt::InputArgList InputArgs =
       T.ParseArgs(ArgsArr, MissingArgumentIndex, MissingArgumentCount);
 
+  static const char Usage[] = "llvm-strip [options] file...";
   if (InputArgs.size() == 0) {
-    T.PrintHelp(errs(), "llvm-strip", "strip tool");
+    T.PrintHelp(errs(), Usage, "strip tool");
     exit(1);
   }
 
   if (InputArgs.hasArg(STRIP_help)) {
-    T.PrintHelp(outs(), "llvm-strip", "strip tool");
+    T.PrintHelp(outs(), Usage, "strip tool");
     exit(0);
   }