[1/2] Remove unused variable in gdb/varobj.c when built without Python support

Message ID 1469101077-18220-1-git-send-email-palves@redhat.com
State New, archived
Headers

Commit Message

Pedro Alves July 21, 2016, 11:37 a.m. UTC
  gdb/ChangeLog:
yyyy-mm-dd  Pedro Alves  <palves@redhat.com>

	* varobj.c (varobj_value_get_print_value): Move "gdbarch" to block
	scope that uses it.
---
 gdb/varobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Yao Qi July 21, 2016, 2:01 p.m. UTC | #1
On Thu, Jul 21, 2016 at 12:37 PM, Pedro Alves <palves@redhat.com> wrote:
> gdb/ChangeLog:
> yyyy-mm-dd  Pedro Alves  <palves@redhat.com>
>
>         * varobj.c (varobj_value_get_print_value): Move "gdbarch" to block
>         scope that uses it.

It is good to me.
  
Pedro Alves July 21, 2016, 2:31 p.m. UTC | #2
On 07/21/2016 03:01 PM, Yao Qi wrote:
> On Thu, Jul 21, 2016 at 12:37 PM, Pedro Alves <palves@redhat.com> wrote:
>> gdb/ChangeLog:
>> yyyy-mm-dd  Pedro Alves  <palves@redhat.com>
>>
>>         * varobj.c (varobj_value_get_print_value): Move "gdbarch" to block
>>         scope that uses it.
> 
> It is good to me.
> 

Pushed.

Thanks,
Pedro Alves
  

Patch

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 6f56cba..fb1349a 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -2453,7 +2453,6 @@  varobj_value_get_print_value (struct value *value,
   struct type *type = NULL;
   long len = 0;
   char *encoding = NULL;
-  struct gdbarch *gdbarch = NULL;
   /* Initialize it just to avoid a GCC false warning.  */
   CORE_ADDR str_addr = 0;
   int string_print = 0;
@@ -2464,7 +2463,6 @@  varobj_value_get_print_value (struct value *value,
   stb = mem_fileopen ();
   old_chain = make_cleanup_ui_file_delete (stb);
 
-  gdbarch = get_type_arch (value_type (value));
 #if HAVE_PYTHON
   if (gdb_python_initialized)
     {
@@ -2518,6 +2516,7 @@  varobj_value_get_print_value (struct value *value,
 
 		      if (s)
 			{
+			  struct gdbarch *gdbarch;
 			  char *hint;
 
 			  hint = gdbpy_get_display_hint (value_formatter);
@@ -2530,6 +2529,7 @@  varobj_value_get_print_value (struct value *value,
 
 			  len = strlen (s);
 			  thevalue = (char *) xmemdup (s, len + 1, len + 1);
+			  gdbarch = get_type_arch (value_type (value));
 			  type = builtin_type (gdbarch)->builtin_char;
 			  xfree (s);