[commit] print breakpoint address only once (branch?)

[Joel Brobecker <brobecker@adacore.com>]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

> > Let me know if you'd like me to fix this.
> 
> Yes please.

Ok, fixed thusly:

2008-04-17  Joel Brobecker  <brobecker@adacore.com>

        * breakpoint.c (print_one_breakpoint_location): Make sure to print
        the breakpoint address only once.

Tested on x86-linux, no regression.

I think this should probably go in 6.8 as well. Any objection?

-- 
Joel

[-- Attachment #2: bp.diff --]
[-- Type: text/plain, Size: 694 bytes --]

Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.308
diff -u -p -r1.308 breakpoint.c
--- breakpoint.c	15 Apr 2008 14:32:12 -0000	1.308
+++ breakpoint.c	17 Apr 2008 22:41:53 -0000
@@ -3607,7 +3607,7 @@ print_one_breakpoint_location (struct br
 	    annotate_field (4);
 	    if (header_of_multiple)
 	      ui_out_field_string (uiout, "addr", "<MULTIPLE>");
-	    if (b->loc == NULL || loc->shlib_disabled)
+	    else if (b->loc == NULL || loc->shlib_disabled)
 	      ui_out_field_string (uiout, "addr", "<PENDING>");
 	    else
 	      ui_out_field_core_addr (uiout, "addr", loc->address);