Patchwork m68k: 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-3-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/49866/
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.
It also removes a type cast which is not needed.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 m68k-dis.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Aurelien Jarno - April 13, 2010, 10:17 p.m.
On Fri, Apr 09, 2010 at 10:49:51PM +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.
> It also removes a type cast which is not needed.
> 
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Thanks, applied.

> ---
>  m68k-dis.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/m68k-dis.c b/m68k-dis.c
> index d38d5a2..7cd88f8 100644
> --- a/m68k-dis.c
> +++ b/m68k-dis.c
> @@ -1104,7 +1104,7 @@ print_insn_arg (const char *d,
>        {
>          static const char *const cacheFieldName[] = { "nc", "dc", "ic", "bc" };
>          val = fetch_arg (buffer, place, 2, info);
> -        (*info->fprintf_func) (info->stream, cacheFieldName[val]);
> +        (*info->fprintf_func) (info->stream, "%s", cacheFieldName[val]);
>          break;
>        }
>  
> @@ -1199,7 +1199,7 @@ print_insn_arg (const char *d,
>  	{
>  	  static const char *const scalefactor_name[] = { "<<", ">>" };
>  	  val = fetch_arg (buffer, place, 1, info);
> -	  (*info->fprintf_func) (info->stream, scalefactor_name[val]);
> +	  (*info->fprintf_func) (info->stream, "%s", scalefactor_name[val]);
>  	}
>        else
>  	{
> @@ -1804,7 +1804,7 @@ match_insn_m68k (bfd_vma memaddr,
>  
>    save_p = p;
>    info->print_address_func = dummy_print_address;
> -  info->fprintf_func = (fprintf_ftype) dummy_printer;
> +  info->fprintf_func = dummy_printer;
>  
>    /* We scan the operands twice.  The first time we don't print anything,
>       but look for errors.  */
> -- 
> 1.5.6.5
> 
> 
> 
>

Patch

diff --git a/m68k-dis.c b/m68k-dis.c
index d38d5a2..7cd88f8 100644
--- a/m68k-dis.c
+++ b/m68k-dis.c
@@ -1104,7 +1104,7 @@  print_insn_arg (const char *d,
       {
         static const char *const cacheFieldName[] = { "nc", "dc", "ic", "bc" };
         val = fetch_arg (buffer, place, 2, info);
-        (*info->fprintf_func) (info->stream, cacheFieldName[val]);
+        (*info->fprintf_func) (info->stream, "%s", cacheFieldName[val]);
         break;
       }
 
@@ -1199,7 +1199,7 @@  print_insn_arg (const char *d,
 	{
 	  static const char *const scalefactor_name[] = { "<<", ">>" };
 	  val = fetch_arg (buffer, place, 1, info);
-	  (*info->fprintf_func) (info->stream, scalefactor_name[val]);
+	  (*info->fprintf_func) (info->stream, "%s", scalefactor_name[val]);
 	}
       else
 	{
@@ -1804,7 +1804,7 @@  match_insn_m68k (bfd_vma memaddr,
 
   save_p = p;
   info->print_address_func = dummy_print_address;
-  info->fprintf_func = (fprintf_ftype) dummy_printer;
+  info->fprintf_func = dummy_printer;
 
   /* We scan the operands twice.  The first time we don't print anything,
      but look for errors.  */