From 21cbba772bc49b385076834496fd8475a85064cd Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Tue, 1 Mar 2011 22:13:48 +0000 Subject: [PATCH] 2011-03-01 Michael Snyder * tracepoint.c (scope_info): Fix mem leak, remove underused variable. --- gdb/ChangeLog | 3 +++ gdb/tracepoint.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ddb917e8c5..59eaa44fe5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2011-03-01 Michael Snyder + * 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 2d675ce118..b5a2e0a678 100644 --- 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. */