[PATCH] Fix PR breakpoints/20739: Badly formatted adress string in error message

[PATCH] Fix PR breakpoints/20739: Badly formatted adress string in error message

[Cordian A. Daniluk]

Remove duplicate `0x'-prefix for the hex address printed. `paddress'
already prepends this, so no need to do it manually.

gdb/ChangeLog:

	* breakpoint.c (check_fast_tracepoint_sals): fix PR
	breakpoints/20739
---
 gdb/breakpoint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 25849da..0adebae 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9628,7 +9628,7 @@ check_fast_tracepoint_sals (struct gdbarch *gdbarch,
       old_chain = make_cleanup (xfree, msg);
 
       if (!rslt)
-	error (_("May not have a fast tracepoint at 0x%s%s"),
+	error (_("May not have a fast tracepoint at %s%s"),
 	       paddress (sarch, sal->pc), (msg ? msg : ""));
 
       do_cleanups (old_chain);
-- 
2.9.2

Re: [PATCH] Fix PR breakpoints/20739: Badly formatted adress string in error message

[Simon Marchi]

On 2016-10-29 14:39, Cordian A. Daniluk wrote:
> Remove duplicate `0x'-prefix for the hex address printed. `paddress'
> already prepends this, so no need to do it manually.
> 
> gdb/ChangeLog:
> 
> 	* breakpoint.c (check_fast_tracepoint_sals): fix PR
> 	breakpoints/20739
> ---
>  gdb/breakpoint.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
> index 25849da..0adebae 100644
> --- a/gdb/breakpoint.c
> +++ b/gdb/breakpoint.c
> @@ -9628,7 +9628,7 @@ check_fast_tracepoint_sals (struct gdbarch 
> *gdbarch,
>        old_chain = make_cleanup (xfree, msg);
> 
>        if (!rslt)
> -	error (_("May not have a fast tracepoint at 0x%s%s"),
> +	error (_("May not have a fast tracepoint at %s%s"),
>  	       paddress (sarch, sal->pc), (msg ? msg : ""));
> 
>        do_cleanups (old_chain);

That seems like an obvious fix to me, thanks for addressing it.

For the ChangeLog entry, you should follow the standard format as 
described in the following link:

https://sourceware.org/gdb/wiki/ContributionChecklist#Properly_Formatted_GNU_ChangeLog

That means to put the PR mention above the list of files.  The 
description should tell more or less precisely _what_ has changed (and 
not _why_ it was changed, that belongs to the commit message, which is 
already clear in your case).

For example:

	PR breakpoints/20739
	* breakpoint.c (check_fast_tracepoint_sals): Don't print duplicate 0x
	prefix.

I don't see your name in MAINTAINERS, do you have write access to the 
repo?  If you plan to contribute patches regularly, it would be a good 
idea for you to go through the process to get it (you'll need assistance 
from one of the global maintainers).  Otherwise, somebody else with 
write access can push it for you.

Thanks,

Simon

Re: [PATCH] Fix PR breakpoints/20739: Badly formatted adress string in error message

[Pedro Alves]

On 10/29/2016 08:57 PM, Simon Marchi wrote:

>>        old_chain = make_cleanup (xfree, msg);
>>
>>        if (!rslt)
>> -    error (_("May not have a fast tracepoint at 0x%s%s"),
>> +    error (_("May not have a fast tracepoint at %s%s"),
>>             paddress (sarch, sal->pc), (msg ? msg : ""));
>>
>>        do_cleanups (old_chain);
> 
> That seems like an obvious fix to me, thanks for addressing it.

Agreed.

> That means to put the PR mention above the list of files.  The
> description should tell more or less precisely _what_ has changed (and
> not _why_ it was changed, that belongs to the commit message, which is
> already clear in your case).
> 
> For example:
> 
>     PR breakpoints/20739
>     * breakpoint.c (check_fast_tracepoint_sals): Don't print duplicate 0x
>     prefix.

Thanks, I copied that into the patch.

> I don't see your name in MAINTAINERS, do you have write access to the
> repo?  If you plan to contribute patches regularly, it would be a good
> idea for you to go through the process to get it (you'll need assistance
> from one of the global maintainers).  Otherwise, somebody else with
> write access can push it for you.

I've pushed it in now, as below.

From 53c3572a9f5b03a92292cb6d24bf69b52c95500e Mon Sep 17 00:00:00 2001
From: "Cordian A. Daniluk" <th3c0r1uk@gmail.com>
Date: Sat, 29 Oct 2016 20:39:57 +0200
Subject: [PATCH] Fix PR breakpoints/20739: Badly formatted adress string in
 error message

Remove duplicate `0x'-prefix for the hex address printed.  `paddress'
already prepends this, so no need to do it manually.

gdb/ChangeLog:
2016-11-08  Cordian A. Daniluk  <th3c0r1uk@gmail.com>

	PR breakpoints/20739
	* breakpoint.c (check_fast_tracepoint_sals): Don't print duplicate
	0x prefix.
---
 gdb/ChangeLog    | 6 ++++++
 gdb/breakpoint.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index db5ec9b..099c63e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-08  Cordian A. Daniluk  <th3c0r1uk@gmail.com>
+
+	PR breakpoints/20739
+	* breakpoint.c (check_fast_tracepoint_sals): Don't print duplicate
+	0x prefix.
+
 2016-11-08  Yao Qi  <yao.qi@linaro.org>
 
 	* rust-lang.c (val_print_struct): Fix indentation.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 3908dab..9f9cb8a 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9653,7 +9653,7 @@ check_fast_tracepoint_sals (struct gdbarch *gdbarch,
       old_chain = make_cleanup (xfree, msg);
 
       if (!rslt)
-	error (_("May not have a fast tracepoint at 0x%s%s"),
+	error (_("May not have a fast tracepoint at %s%s"),
 	       paddress (sarch, sal->pc), (msg ? msg : ""));
 
       do_cleanups (old_chain);
-- 
2.5.5