Patchwork arm: Fix compiler warning (fprintf format string)

login
register
mail settings
Submitter Stefan Weil
Date April 9, 2010, 8:49 p.m.
Message ID <1270846193-5667-2-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/49868/
State New
Headers show

Comments

Stefan Weil - April 9, 2010, 8:49 p.m.
When argument checking is enabled, gcc throws this error:

error: format not a string literal and no format arguments

The patch rewrites the statement to satisfy the compiler.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 arm-dis.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Aurelien Jarno - April 13, 2010, 10:16 p.m.
On Fri, Apr 09, 2010 at 10:49:50PM +0200, Stefan Weil wrote:
> When argument checking is enabled, gcc throws this error:
> 
> error: format not a string literal and no format arguments
> 
> The patch rewrites the statement to satisfy the compiler.
> 
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Thanks, applied.

> ---
>  arm-dis.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arm-dis.c b/arm-dis.c
> index 4fb899e..5028555 100644
> --- a/arm-dis.c
> +++ b/arm-dis.c
> @@ -3149,14 +3149,14 @@ print_insn_thumb16 (bfd_vma pc, struct disassemble_info *info, long given)
>  		      if (started)
>  			func (stream, ", ");
>  		      started = 1;
> -		      func (stream, arm_regnames[14] /* "lr" */);
> +		      func (stream, "%s", arm_regnames[14] /* "lr" */);
>  		    }
>  
>  		  if (domaskpc)
>  		    {
>  		      if (started)
>  			func (stream, ", ");
> -		      func (stream, arm_regnames[15] /* "pc" */);
> +		      func (stream, "%s", arm_regnames[15] /* "pc" */);
>  		    }
>  
>  		  func (stream, "}");
> @@ -3699,7 +3699,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
>  		  }
>  		else
>  		  {
> -		    func (stream, psr_name (given & 0xff));
> +		    func (stream, "%s", psr_name (given & 0xff));
>  		  }
>  		break;
>  
> @@ -3707,7 +3707,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
>  		if ((given & 0xff) == 0)
>  		  func (stream, "%cPSR", (given & 0x100000) ? 'S' : 'C');
>  		else
> -		  func (stream, psr_name (given & 0xff));
> +		  func (stream, "%s", psr_name (given & 0xff));
>  		break;
>  
>  	      case '0': case '1': case '2': case '3': case '4':
> -- 
> 1.5.6.5
> 
> 
> 
>

Patch

diff --git a/arm-dis.c b/arm-dis.c
index 4fb899e..5028555 100644
--- a/arm-dis.c
+++ b/arm-dis.c
@@ -3149,14 +3149,14 @@  print_insn_thumb16 (bfd_vma pc, struct disassemble_info *info, long given)
 		      if (started)
 			func (stream, ", ");
 		      started = 1;
-		      func (stream, arm_regnames[14] /* "lr" */);
+		      func (stream, "%s", arm_regnames[14] /* "lr" */);
 		    }
 
 		  if (domaskpc)
 		    {
 		      if (started)
 			func (stream, ", ");
-		      func (stream, arm_regnames[15] /* "pc" */);
+		      func (stream, "%s", arm_regnames[15] /* "pc" */);
 		    }
 
 		  func (stream, "}");
@@ -3699,7 +3699,7 @@  print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
 		  }
 		else
 		  {
-		    func (stream, psr_name (given & 0xff));
+		    func (stream, "%s", psr_name (given & 0xff));
 		  }
 		break;
 
@@ -3707,7 +3707,7 @@  print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
 		if ((given & 0xff) == 0)
 		  func (stream, "%cPSR", (given & 0x100000) ? 'S' : 'C');
 		else
-		  func (stream, psr_name (given & 0xff));
+		  func (stream, "%s", psr_name (given & 0xff));
 		break;
 
 	      case '0': case '1': case '2': case '3': case '4':