Re: [PATCH] Don't give spurious warnings when using thread specific breakpoints

[Andrew STUBBS <andrew dot stubbs at st dot com>]

Daniel Jacobowitz wrote:
> There's no useful translation for " and".  If you can't group the
> translatable bits into whole messages, you're pretty much stuck.
> Maybe Eli will have a suggestion on how to properly mark up this.

Do not most languages have a translation for these examples? Certainly 
many languages are happy with " and" (" et", " und" ...) and the other 
bits, "(permanent)", "(disabled)", "(all threads)" and "(thread %d)", 
are self contained and seem readily translatable to me.

If a specific language can't do something useful with it they can just 
leave it as " and" they've lost nothing. At least they have the 
opportunity to gain something.

I take your general point though, it's better to translate whole 
sentences. We could fix the 'and' problem like this:

"Note: Breakpoint %s is also set at pc"
"Note: Breakpoints %s and %s are also set at pc"

Of course that would require collecting the strings into a buffer of 
some kind with all the attendant jiggery pokery that that requires. I 
don't know that anything can be done about the various annotations.

In any case, a patch without gettext markup is attached.

Andrew
2006-10-18  Andrew Stubbs  <andrew.stubbs@st.com>

	* breakpoint.c (describe_other_breakpoints): Add thread parameter.
	Annotate display with thread number where appropriate.
	(create_breakpoints): Add thread parameter to call to
	describe_other_breakpoints.

Index: src/gdb/breakpoint.c
===================================================================
--- src.orig/gdb/breakpoint.c	2006-10-18 12:30:23.000000000 +0100
+++ src/gdb/breakpoint.c	2006-10-18 16:00:56.000000000 +0100
@@ -102,7 +102,7 @@ static void breakpoint_adjustment_warnin
 static CORE_ADDR adjust_breakpoint_address (CORE_ADDR bpaddr,
                                             enum bptype bptype);
 
-static void describe_other_breakpoints (CORE_ADDR, asection *);
+static void describe_other_breakpoints (CORE_ADDR, asection *, int);
 
 static void breakpoints_info (char *, int);
 
@@ -3782,7 +3782,7 @@ maintenance_info_breakpoints (char *bnum
 /* Print a message describing any breakpoints set at PC.  */
 
 static void
-describe_other_breakpoints (CORE_ADDR pc, asection *section)
+describe_other_breakpoints (CORE_ADDR pc, asection *section, int thread)
 {
   int others = 0;
   struct breakpoint *b;
@@ -3802,12 +3802,16 @@ describe_other_breakpoints (CORE_ADDR pc
 	  if (!b->pending && (!overlay_debugging || b->loc->section == section))
 	    {
 	      others--;
-	      printf_filtered ("%d%s%s ",
-			       b->number,
+	      printf_filtered ("%d", b->number);
+	      if (b->thread == -1 && thread != -1)
+		printf_filtered (" (all threads)");
+	      else if (b->thread != -1)
+		printf_filtered (" (thread %d)", b->thread);
+	      printf_filtered ("%s%s ",
 			       ((b->enable_state == bp_disabled || 
 				 b->enable_state == bp_shlib_disabled || 
 				 b->enable_state == bp_call_disabled) 
-				? " (disabled)" 
+				? " (disabled)"
 				: b->enable_state == bp_permanent 
 				? " (permanent)"
 				: ""),
@@ -4960,7 +4964,7 @@ create_breakpoints (struct symtabs_and_l
 	struct symtab_and_line sal = sals.sals[i];
 
 	if (from_tty)
-	  describe_other_breakpoints (sal.pc, sal.section);
+	  describe_other_breakpoints (sal.pc, sal.section, thread);
 	
 	b = set_raw_breakpoint (sal, type);
 	set_breakpoint_count (breakpoint_count + 1);