2011-03-01 Michael Snyder <msnyder@vmware.com>

	* tracepoint.c (scope_info): Fix mem leak, remove underused
	variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddb917e8c59eca79f10bb44365f3542631d396e3..59eaa44fe5933cd7aad5161d4c2cb1b82b176f34 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-01  Michael Snyder  <msnyder@vmware.com>
 
+       * tracepoint.c (scope_info): Fix mem leak, remove underused
+       variable.
+
        * python/py-prettyprint.c (apply_val_pretty_printer): Remove
        superfluous null check.
 

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 2d675ce118b18df684ff9f5132d3ab0cc960db05..b5a2e0a6781ce678d8693c1ff25ed9049e67416c 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2327,7 +2327,7 @@ scope_info (char *args, int from_tty)
   struct symbol *sym;
   struct minimal_symbol *msym;
   struct block *block;
-  char **canonical, *symname, *save_args = args;
+  char *symname, *save_args = args;
   struct dict_iterator iter;
   int j, count = 0;
   struct gdbarch *gdbarch;
@@ -2337,7 +2337,7 @@ scope_info (char *args, int from_tty)
     error (_("requires an argument (function, "
             "line or *addr) to define a scope"));
 
-  sals = decode_line_1 (&args, 1, NULL, 0, &canonical, NULL);
+  sals = decode_line_1 (&args, 1, NULL, 0, NULL, NULL);
   if (sals.nelts == 0)
     return;            /* Presumably decode_line_1 has already warned.  */