* blockframe.c (get_pc_function_start): Rewrite to avoid

asignments in if-statements.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1cc7db174285f731fd266b3180064ac5a3648926..d47cb92a997c9b45c632fafc7294c064abd28940 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-23  Mark Kettenis  <kettenis@gnu.org>
+
+       * blockframe.c (get_pc_function_start): Rewrite to avoid
+       asignments in if-statements.
+
 2003-05-23  Raoul Gough  <RaoulGough@yahoo.co.uk>
 
        Committed by Elena Zannoni  <ezannoni@redhat.com>.

diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 3c713763a7146fe4eb0b20b1093721863f39890f..1027a4652732c6ae9f5d0b76b26c0df394f50a3d 100644 (file)
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -223,28 +223,31 @@ get_frame_block (struct frame_info *frame, CORE_ADDR *addr_in_block)
 CORE_ADDR
 get_pc_function_start (CORE_ADDR pc)
 {
-  register struct block *bl;
-  register struct symbol *symbol;
-  register struct minimal_symbol *msymbol;
-  CORE_ADDR fstart;
+  struct block *bl;
+  struct minimal_symbol *msymbol;
 
-  if ((bl = block_for_pc (pc)) != NULL &&
-      (symbol = block_function (bl)) != NULL)
-    {
-      bl = SYMBOL_BLOCK_VALUE (symbol);
-      fstart = BLOCK_START (bl);
-    }
-  else if ((msymbol = lookup_minimal_symbol_by_pc (pc)) != NULL)
+  bl = block_for_pc (pc);
+  if (bl)
     {
-      fstart = SYMBOL_VALUE_ADDRESS (msymbol);
-      if (!find_pc_section (fstart))
-       return 0;
+      struct symbol *symbol = block_function (bl);
+
+      if (symbol)
+       {
+         bl = SYMBOL_BLOCK_VALUE (symbol);
+         return BLOCK_START (bl);
+       }
     }
-  else
+
+  msymbol = lookup_minimal_symbol_by_pc (pc);
+  if (msymbol)
     {
-      fstart = 0;
+      CORE_ADDR fstart = SYMBOL_VALUE_ADDRESS (msymbol);
+
+      if (find_pc_section (fstart))
+       return fstart;
     }
-  return (fstart);
+
+  return 0;
 }
 
 /* Return the symbol for the function executing in frame FRAME.  */