daily update

[deliverable/binutils-gdb.git] / gdb / linespec.c

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 9183064d704032b6f7205d18b8a0628eb8e43124..68859a8457dcb6d6708b553b9ec1712d7e3ea8f1 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -748,9 +748,9 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
   if (**argptr == '*')
     return decode_indirect (argptr);
 
-  is_quoted = (*argptr
-              && 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);
 
@@ -980,7 +980,7 @@ decode_indirect (char **argptr)
   CORE_ADDR pc;
   
   (*argptr)++;
-  pc = parse_and_eval_address_1 (argptr);
+  pc = value_as_address (parse_to_comma_and_eval (argptr));
 
   values.sals = (struct symtab_and_line *)
     xmalloc (sizeof (struct symtab_and_line));