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 59eaa44fe5933cd7aad5161d4c2cb1b82b176f34..e9e1a9dbf5daa0035b96e7e3b8867587358122c5 100644 (file)
--- 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 e9548e8693462fce43da3955607266283f948cef..5979c16feb4031cdd288e00755037b0690f6944e 100644 (file)
--- 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);