Introduce command_line_up

[deliverable/binutils-gdb.git] / gdb / mi / mi-cmd-break.c

diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 4b6b19d15958864b1a0b318cfe63f82ca348bfeb..cfe2d34f23fdd9823a025d82bd4c405d258f92aa 100644 (file)
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -1,5 +1,5 @@
 /* MI Command Set - breakpoint and watchpoint commands.
 /* MI Command Set - breakpoint and watchpoint commands.

-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2017 Free Software Foundation, Inc.

    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.


@@ -167,7 +167,7 @@ mi_argv_to_format (char **argv, int argc)
    If not, it will insert other type breakpoint.  */
 
 static void
    If not, it will insert other type breakpoint.  */
 
 static void

-mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc)
+mi_cmd_break_insert_1 (int dprintf, const char *command, char **argv, int argc)

 {
   char *address = NULL;
   int hardware = 0;
 {
   char *address = NULL;
   int hardware = 0;


@@ -180,7 +180,7 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc)
   int tracepoint = 0;
   struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
   enum bptype type_wanted;
   int tracepoint = 0;
   struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
   enum bptype type_wanted;

-  struct event_location *location;
+  event_location_up location;

   struct breakpoint_ops *ops;
   int is_explicit = 0;
   struct explicit_location explicit_loc;
   struct breakpoint_ops *ops;
   int is_explicit = 0;
   struct explicit_location explicit_loc;


@@ -341,17 +341,12 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc)
     }
   else
     {
     }
   else
     {

-      location = string_to_event_location (&address, current_language);
+      location = string_to_event_location_basic (&address, current_language);

       if (*address)
       if (*address)

-       {
-         delete_event_location (location);
-         error (_("Garbage '%s' at end of location"), address);
-       }
+       error (_("Garbage '%s' at end of location"), address);

     }
 
     }
 

-  make_cleanup_delete_event_location (location);
-
-  create_breakpoint (get_current_arch (), location, condition, thread,
+  create_breakpoint (get_current_arch (), location.get (), condition, thread,

                     extra_string,
                     0 /* condition and thread are valid.  */,
                     temp_p, type_wanted,
                     extra_string,
                     0 /* condition and thread are valid.  */,
                     temp_p, type_wanted,


@@ -365,7 +360,7 @@ mi_cmd_break_insert_1 (int dprintf, char *command, char **argv, int argc)
    See the MI manual for the list of possible options.  */
 
 void
    See the MI manual for the list of possible options.  */
 
 void

-mi_cmd_break_insert (char *command, char **argv, int argc)
+mi_cmd_break_insert (const char *command, char **argv, int argc)

 {
   mi_cmd_break_insert_1 (0, command, argv, argc);
 }
 {
   mi_cmd_break_insert_1 (0, command, argv, argc);
 }


@@ -374,7 +369,7 @@ mi_cmd_break_insert (char *command, char **argv, int argc)
    See the MI manual for the list of possible options.  */
 
 void
    See the MI manual for the list of possible options.  */
 
 void

-mi_cmd_dprintf_insert (char *command, char **argv, int argc)
+mi_cmd_dprintf_insert (const char *command, char **argv, int argc)

 {
   mi_cmd_break_insert_1 (1, command, argv, argc);
 }
 {
   mi_cmd_break_insert_1 (1, command, argv, argc);
 }


@@ -387,7 +382,7 @@ enum wp_type
 };
 
 void
 };
 
 void

-mi_cmd_break_passcount (char *command, char **argv, int argc)
+mi_cmd_break_passcount (const char *command, char **argv, int argc)

 {
   int n;
   int p;
 {
   int n;
   int p;


@@ -418,7 +413,7 @@ mi_cmd_break_passcount (char *command, char **argv, int argc)
    -break-watch -a <expr> --> insert an access wp.  */
 
 void
    -break-watch -a <expr> --> insert an access wp.  */
 
 void

-mi_cmd_break_watch (char *command, char **argv, int argc)
+mi_cmd_break_watch (const char *command, char **argv, int argc)

 {
   char *expr = NULL;
   enum wp_type type = REG_WP;
 {
   char *expr = NULL;
   enum wp_type type = REG_WP;


@@ -496,9 +491,9 @@ mi_read_next_line (void)
 }
 
 void
 }
 
 void

-mi_cmd_break_commands (char *command, char **argv, int argc)
+mi_cmd_break_commands (const char *command, char **argv, int argc)

 {
 {

-  struct command_line *break_command;
+  command_line_up break_command;

   char *endptr;
   int bnum;
   struct breakpoint *b;
   char *endptr;
   int bnum;
   struct breakpoint *b;


@@ -528,6 +523,6 @@ mi_cmd_break_commands (char *command, char **argv, int argc)
   else
     break_command = read_command_lines_1 (mi_read_next_line, 1, 0, 0);
 
   else
     break_command = read_command_lines_1 (mi_read_next_line, 1, 0, 0);
 

-  breakpoint_set_commands (b, break_command);
+  breakpoint_set_commands (b, std::move (break_command));

 }
 
 }