Use ui_file_as_string in gdb/compile/

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

diff --git a/gdb/location.c b/gdb/location.c
index bbd26963f05e228856ad85f127730df3e86ab349..8dce21ada12b3f8cb4145d1af96e29efe378bda2 100644 (file)
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -498,9 +498,8 @@ explicit_location_lex_one (const char **inp,
        {
          /* Special case: C++ operator,.  */
          if (language->la_language == language_cplus
-             && strncmp (*inp, "operator", 8)
-             && (*inp)[9] == ',')
-           (*inp) += 9;
+             && strncmp (*inp, "operator", 8) == 0)
+           (*inp) += 8;
          ++(*inp);
        }
     }
@@ -525,7 +524,7 @@ string_to_explicit_location (const char **argp,
      character is an explicit location.  "-p" is reserved, though,
      for probe locations.  */
   if (argp == NULL
-      || *argp == '\0'
+      || *argp == NULL
       || *argp[0] != '-'
       || !isalpha ((*argp)[1])
       || ((*argp)[0] == '-' && (*argp)[1] == 'p'))
@@ -640,7 +639,7 @@ string_to_event_location_basic (char **stringp,
                                const struct language_defn *language)
 {
   struct event_location *location;
-  const char *arg, *orig, *cs;
+  const char *cs;
 
   /* Try the input as a probe spec.  */
   cs = *stringp;