X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fguile%2Fscm-value.c;h=3732666a8897a64e9c9af6b1c46e0398f0b16971;hb=432ae719d35c81324e01ae6bd9970cc43e69fa5e;hp=0dc66302ed3f6fa3bda237d46b0e4fe0e51b8826;hpb=4fa7574eecb9a92ef40f77de572541e402a2749e;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index 0dc66302ed..3732666a88 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -421,24 +421,19 @@ gdbscm_value_address (SCM self)
 
   if (SCM_UNBNDP (v_smob->address))
     {
-      struct value *res_val = NULL;
       struct cleanup *cleanup
 	= make_cleanup_value_free_to_mark (value_mark ());
-      SCM address;
+      SCM address = SCM_BOOL_F;
 
       TRY
 	{
-	  res_val = value_addr (value);
+	  address = vlscm_scm_from_value (value_addr (value));
 	}
       CATCH (except, RETURN_MASK_ALL)
 	{
-	  address = SCM_BOOL_F;
 	}
       END_CATCH
 
-      if (res_val != NULL)
-	address = vlscm_scm_from_value (res_val);
-
       do_cleanups (cleanup);
 
       if (gdbscm_is_exception (address))