From: Dodji Seketeli <dodji@redhat.com>
Date: Tue, 5 Jan 2016 11:32:24 +0000 (+0100)
Subject: Fix abidw -v
X-Git-Tag: libabigail-1.0.rc1~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=097a5c46ff1f856319431f5d9e995f6e287ef1c9;p=platform%2Fupstream%2Flibabigail.git

Fix abidw -v

abidw -v was failing to work until now.  This patch fixes that.

	* tools/abidw.cc (parse_command_line): Simplify logic.
	(main): Fix logic.

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

diff --git a/tools/abidw.cc b/tools/abidw.cc
index 5d8ed985..a0455dbd 100644
--- a/tools/abidw.cc
+++ b/tools/abidw.cc
@@ -127,10 +127,7 @@ parse_command_line(int argc, char* argv[], options& opts)
 	}
       else if (!strcmp(argv[i], "--version")
 	       || !strcmp(argv[i], "-v"))
-	{
-	  opts.display_version = true;
-	  return true;
-	}
+	opts.display_version = true;
       else if (!strcmp(argv[i], "--debug-info-dir")
 	       || !strcmp(argv[i], "-d"))
 	{
@@ -211,7 +208,8 @@ main(int argc, char* argv[])
   options opts;
 
   if (!parse_command_line(argc, argv, opts)
-      || opts.in_file_path.empty())
+      || (opts.in_file_path.empty()
+	  && !opts.display_version))
     {
       display_usage(argv[0], cerr);
       return 1;