Merge GDB 7.5.1

gdb/skip.c

 /* Skipping uninteresting files and functions while stepping.
 
    Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ skipping 49 matching lines @@
   int pending;
 
   struct skiplist_entry *next;
 };
 
 static void skip_function_command (char *arg, int from_tty);
 static void skip_file_command (char *arg, int from_tty);
 static void skip_info (char *arg, int from_tty);
 
 static void add_skiplist_entry (struct skiplist_entry *e);
-static void skip_function_pc (CORE_ADDR pc, char *name,
+static void skip_function_pc (CORE_ADDR pc, const char *name,
                               struct gdbarch *arch,
                               int pending);
 
 static struct skiplist_entry *skiplist_entry_chain;
 static int skiplist_entry_count;
 
 #define ALL_SKIPLIST_ENTRIES(E) \
   for (E = skiplist_entry_chain; E; E = E->next)
 
 #define ALL_SKIPLIST_ENTRIES_SAFE(E,TMP) \
@@ skipping 45 matching lines @@
 
   add_skiplist_entry (e);
 
   printf_filtered (_("File %s will be skipped when stepping.\n"), filename);
 }
 
 static void
 skip_function_command (char *arg, int from_tty)
 {
   CORE_ADDR func_pc;
-  char *name = NULL;
+  const char *name = NULL;
 
   /* Default to the current function if no argument is given.  */
   if (arg == 0)
     {
       CORE_ADDR pc;
       if (!last_displayed_sal_is_valid ())
         error (_("No default function now."));
 
       pc = get_last_displayed_addr ();
       if (!find_pc_partial_function (pc, &name, &func_pc, 0))
         {
           error (_("No function found containing current program point %s."),
                   paddress (get_current_arch (), pc));
         }
       skip_function_pc (func_pc, name, get_current_arch (), 0);
     }
   else
     {
       /* Decode arg.  We set funfirstline=1 so decode_line_1 will give us the
          first line of the function specified, if it can, and so that we'll
          reject variable names and the like.  */
-
-      int i;
-      int pending = 0;
       char *orig_arg = arg; /* decode_line_1 modifies the arg pointer.  */
       volatile struct gdb_exception decode_exception;
       struct symtabs_and_lines sals = { 0 };
 
       TRY_CATCH (decode_exception, RETURN_MASK_ERROR)
         {
           sals = decode_line_1 (&arg, DECODE_LINE_FUNFIRSTLINE, 0, 0);
         }
 
       if (decode_exception.reason < 0)
@@ skipping 219 matching lines @@
       }
 
   if (!found)
     error (_("No skiplist entries found with number %s."), arg);
 }
 
 /* Create a skiplist entry for the given pc corresponding to the given
    function name and add it to the list.  */
 
 static void
-skip_function_pc (CORE_ADDR pc, char *name, struct gdbarch *arch,
+skip_function_pc (CORE_ADDR pc, const char *name, struct gdbarch *arch,
                   int pending)
 {
   struct skiplist_entry *e = XZALLOC (struct skiplist_entry);
 
   e->pc = pc;
   e->gdbarch = arch;
   e->enabled = 1;
   e->pending = pending;
   e->function_name = xstrdup (name);
 
@@ skipping 106 matching lines @@
               sals = decode_line_1 (&func_name, DECODE_LINE_FUNFIRSTLINE, 0, 0);
             }
 
           if (decode_exception.reason >= 0
               && sals.nelts == 1 && strlen (func_name) == 0)
             {
               struct symtab_and_line sal = sals.sals[0];
               CORE_ADDR pc = sal.pc;
               CORE_ADDR func_start = 0;
               struct gdbarch *arch = get_sal_arch (sal);
-              char *func_name;
+              const char *func_name;
 
               if (find_pc_partial_function (pc, &func_name, &func_start, 0))
                 {
                   e->pending = 0;
                   e->function_name = xstrdup (func_name);
                   e->pc = func_start;
                   e->gdbarch = arch;
                 }
             }
           else
             {
               e->pending = 1;
             }
         }
     }
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_step_skip;
+
 void
 _initialize_step_skip (void)
 {
   struct cmd_list_element *c;
 
   skiplist_entry_chain = 0;
   skiplist_entry_count = 0;
 
   add_prefix_cmd ("skip", class_breakpoint, skip_function_command, _("\
 Ignore a function while stepping.\n\
@@ skipping 38 matching lines @@
 
   add_info ("skip", skip_info, _("\
 Display the status of skips.  You can specify numbers (e.g. \"skip info 1 3\"), \
 ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-8\").\n\n\
 If you don't specify any numbers or ranges, we'll show all skips.\n\n\
 Usage: skip info [NUMBERS AND/OR RANGES]\n\
 The \"Type\" column indicates one of:\n\
 \tfile        - ignored file\n\
 \tfunction    - ignored function"));
 }