From e2df15478a4103e20ce9dd41384eb3c33b15876f Mon Sep 17 00:00:00 2001
From: Aleksandar Ristovski <aristovski@qnx.com>
Date: Mon, 1 Apr 2013 12:48:03 +0000
Subject: [PATCH] 	Cleanup: remove unused - breakpoint, buildsym

	* breakpoint.c (parse_cond_to_aexpr): Remove unused 'old_chain'.
	(print_it_watchpoint): Remove unused 'bl'.
	(say_where): Remove unused 'uiout'.
	(bpstat_remove_breakpoint_callback): Remove unused 'uiout'.
	(bkpt_breakpoint_hit): Remove unused 'b'.
	(internal_bkpt_print_it): Remove unused 'uiout'.
	* buildsym.c (augment_type_symtab): Remove unused 'i'.

	Reference: http://sourceware.org/ml/gdb-patches/2013-03/msg01080.html
---
 gdb/ChangeLog    | 10 ++++++++++
 gdb/breakpoint.c |  8 --------
 gdb/buildsym.c   |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 431fbcc7ee..00739df993 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-01  Aleksandar Ristovski  <aristovski@qnx.com>
+
+	* breakpoint.c (parse_cond_to_aexpr): Remove unused 'old_chain'.
+	(print_it_watchpoint): Remove unused 'bl'.
+	(say_where): Remove unused 'uiout'.
+	(bpstat_remove_breakpoint_callback): Remove unused 'uiout'.
+	(bkpt_breakpoint_hit): Remove unused 'b'.
+	(internal_bkpt_print_it): Remove unused 'uiout'.
+	* buildsym.c (augment_type_symtab): Remove unused 'i'.
+
 2013-03-31  Tiago Stürmer Daitx  <tdaitx@linux.vnet.ibm.com>
 
 	* ppc-sysv-tdep.c (ppc64_sysv_abi_push_float): New function.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index c844187467..ff161a0d55 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2047,7 +2047,6 @@ static struct agent_expr *
 parse_cond_to_aexpr (CORE_ADDR scope, struct expression *cond)
 {
   struct agent_expr *aexpr = NULL;
-  struct cleanup *old_chain = NULL;
   volatile struct gdb_exception ex;
 
   if (!cond)
@@ -2185,7 +2184,6 @@ parse_cmd_to_aexpr (CORE_ADDR scope, char *cmd)
   struct cleanup *old_cleanups = 0;
   struct expression *expr, **argvec;
   struct agent_expr *aexpr = NULL;
-  struct cleanup *old_chain = NULL;
   volatile struct gdb_exception ex;
   const char *cmdrest;
   const char *format_start, *format_end;
@@ -10485,7 +10483,6 @@ print_it_watchpoint (bpstat bs)
 {
   struct cleanup *old_chain;
   struct breakpoint *b;
-  const struct bp_location *bl;
   struct ui_file *stb;
   enum print_stop_action result;
   struct watchpoint *w;
@@ -10493,7 +10490,6 @@ print_it_watchpoint (bpstat bs)
 
   gdb_assert (bs->bp_location_at != NULL);
 
-  bl = bs->bp_location_at;
   b = bs->breakpoint_at;
   w = (struct watchpoint *) b;
 
@@ -12719,7 +12715,6 @@ bpstat_remove_breakpoint_callback (struct thread_info *th, void *data)
 static void
 say_where (struct breakpoint *b)
 {
-  struct ui_out *uiout = current_uiout;
   struct value_print_options opts;
 
   get_user_print_options (&opts);
@@ -12988,8 +12983,6 @@ bkpt_breakpoint_hit (const struct bp_location *bl,
 		     struct address_space *aspace, CORE_ADDR bp_addr,
 		     const struct target_waitstatus *ws)
 {
-  struct breakpoint *b = bl->owner;
-
   if (ws->kind != TARGET_WAITKIND_STOPPED
       || ws->value.sig != GDB_SIGNAL_TRAP)
     return 0;
@@ -13183,7 +13176,6 @@ internal_bkpt_check_status (bpstat bs)
 static enum print_stop_action
 internal_bkpt_print_it (bpstat bs)
 {
-  struct ui_out *uiout = current_uiout;
   struct breakpoint *b;
 
   b = bs->breakpoint_at;
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 4d861a5ccf..823ad41119 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1367,7 +1367,6 @@ void
 augment_type_symtab (struct objfile *objfile, struct symtab *primary_symtab)
 {
   struct blockvector *blockvector = primary_symtab->blockvector;
-  int i;
 
   if (context_stack_depth > 0)
     {