From: Michael Snyder <msnyder@vmware.com>
Date: Tue, 1 Mar 2011 22:16:40 +0000 (+0000)
Subject: 2011-03-01  Michael Snyder  <msnyder@vmware.com>
X-Git-Tag: gdb_7_3-branchpoint~463
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e325fb69b4ae1a9f5d276672a883e864861d90d8;p=thirdparty%2Fbinutils-gdb.git

2011-03-01  Michael Snyder  <msnyder@vmware.com>

	* linespec.c (decode_line_1): Remove unnecessary null check.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59eaa44fe59..e9e1a9dbf5d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-01  Michael Snyder  <msnyder@vmware.com>
 
+	* linespec.c (decode_line_1): Remove unnecessary null check.
+
 	* tracepoint.c (scope_info): Fix mem leak, remove underused
 	variable.
 
diff --git a/gdb/linespec.c b/gdb/linespec.c
index e9548e86934..5979c16feb4 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -726,7 +726,7 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
   char *copy;
   /* This says whether or not something in *ARGPTR is quoted with
      completer_quotes (i.e. with single quotes).  */
-  int is_quoted = 0;
+  int is_quoted;
   /* Is *ARGPTR is enclosed in double quotes?  */
   int is_quote_enclosed;
   int is_objc_method = 0;
@@ -745,14 +745,11 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
   
   /* See if arg is *PC.  */
 
-  if (*argptr)
-    {
-      if (**argptr == '*')
-	return decode_indirect (argptr);
+  if (**argptr == '*')
+    return decode_indirect (argptr);
 
-      is_quoted = (strchr (get_gdb_completer_quote_characters (),
-			   **argptr) != NULL);
-    }
+  is_quoted = (strchr (get_gdb_completer_quote_characters (),
+		       **argptr) != NULL);
 
   if (is_quoted)
     end_quote = skip_quoted (*argptr);