Replace --lkaw with -w and --lkaw-pkg with --wp

Make these short options be shorter.

	* doc/manuals/abipkgdiff.rst: Adjust the documentation.
	* tools/abipkgdiff.cc (display_usage): Adjust the usage string.
	(parse_command_line): Parse -w instead of --lkaw and --wp
	insteadof --lkaw-pkg.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/doc/manuals/abipkgdiff.rst b/doc/manuals/abipkgdiff.rst
index 461c9690d21cec9c61c50e2c3257223e829f9fdc..05c378da82f718be109a14daa9b0d359a56eb8b5 100644 (file)
--- a/doc/manuals/abipkgdiff.rst
+++ b/doc/manuals/abipkgdiff.rst
@@ -184,7 +184,7 @@ Options
     the :ref:`default suppression specification files
     <abipkgdiff_default_supprs_label>` are loaded .
 
-  * ``--linux-kernel-abi-whitelist | --lkaw`` <*path-to-whitelist*>
+  * ``--linux-kernel-abi-whitelist | -w`` <*path-to-whitelist*>
 
     When comparing two Linux kernel RPM packages, this option points
     to the white list of names of ELF symbols of functions and
@@ -200,7 +200,7 @@ Options
     functions and global variables by the Linux Kernel binaries are
     compared.
 
-  * ``--lkaw-pkg`` <*path-to-whitelist-package*>
+  * ``--wp`` <*path-to-whitelist-package*>
 
     When comparing two Linux kernel RPM packages, this option points
     an RPM package containining several white lists of names of ELF

diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index a82fafa1b404a18f92ca77ad0fd97d71e0a87f75..7144fb0f7af2df59adac52d6dbff0164165ade7b 100644 (file)
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -636,9 +636,9 @@ display_usage(const string& prog_name, ostream& out)
     << " --no-default-suppression       don't load any default "
        "suppression specifications\n"
     << " --suppressions|--suppr <path>  specify supression specification path\n"
-    << " --linux-kernel-abi-whitelist|--lkaw path to a "
+    << " --linux-kernel-abi-whitelist|-w path to a "
     "linux kernel abi whitelist\n"
-    << " --lkaw-pkg <path>  path to a linux kernel abi whitelist package\n"
+    << " --wp <path>                    path to a linux kernel abi whitelist package\n"
     << " --keep-tmp-files               don't erase created temporary files\n"
     << " --dso-only                     compare shared libraries only\n"
     << " --no-linkage-name             do not display linkage names of "
@@ -2281,7 +2281,7 @@ parse_command_line(int argc, char* argv[], options& opts)
          ++i;
        }
       else if (!strcmp(argv[i], "--linux-kernel-abi-whitelist")
-              || !strcmp(argv[i], "--lkaw"))
+              || !strcmp(argv[i], "-w"))
        {
          int j = i + 1;
          if (j >= argc)
@@ -2293,7 +2293,7 @@ parse_command_line(int argc, char* argv[], options& opts)
          opts.kabi_whitelist_paths.push_back(argv[j]);
          ++i;
        }
-      else if (!strcmp(argv[i], "--lkaw-pkg"))
+      else if (!strcmp(argv[i], "--wp"))
        {
          int j = i + 1;
          if (j >= argc)