From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 10 Mar 2015 13:57:14 +0000 (-0700)
Subject: Move nothing to do warning to main
X-Git-Tag: users/hjl/linux/release/2.25.51.0.2~2^2~31^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5656ba2c217cff434621d6caf135cbda5ae92ac4;hp=b6370efb1efe39e62abd01e95c7957834c8bdf47;p=thirdparty%2Fbinutils-gdb.git

Move nothing to do warning to main

	PR binutils/18101
	* readelf.c (parse_args): Move nothing to do warning to ...
	(main): Here.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 062cec4eed4..f59c0d13590 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/18101
+	* readelf.c (parse_args): Move nothing to do warning to ...
+	(main): Here.
+
 2015-03-10  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/18101
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 771d29dbce6..20cfc473d94 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4232,11 +4232,6 @@ parse_args (int argc, char ** argv)
       && !do_section_groups && !do_archive_index
       && !do_dyn_syms)
     usage (stderr);
-  else if (argc < 3 || (do_wide && argc < 4))
-    {
-      warn (_("Nothing to do.\n"));
-      usage (stderr);
-    }
 }
 
 static const char *
@@ -16131,6 +16126,11 @@ main (int argc, char ** argv)
 
   if (optind < (argc - 1))
     show_name = 1;
+  else if (optind >= argc)
+    {
+      warn (_("Nothing to do.\n"));
+      usage (stderr);
+    }
 
   err = 0;
   while (optind < argc)