opcodes: bfin: simplify field width processing and fix build warnings

This fix the build time warning:
warning: format not a string literal, argument types not checked [-Wformat-nonliteral]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a7264990c294555015767855fe0020c490993f42..0dec560ca4ea19c23e5d5f57b0e4639b381cdc8c 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-01  Mike Frysinger  <vapier@gentoo.org>
+
+       * bfin-dis.c (fmtconst): Replace decimal handling with a single
+       sprintf call and the '*' field width.
+
 2012-03-23  Maxim Kuvyrkov  <maxim@codesourcery.com>
 
        * mips-dis.c (mips_arch_choices): Add entry for Broadcom XLP.

diff --git a/opcodes/bfin-dis.c b/opcodes/bfin-dis.c
index 130dfc7719e5b4bc42517eea0a76445992ce59ba..7470ebdc2a1fa642f85a1acb8ab318441a4de0ce 100644 (file)
--- a/opcodes/bfin-dis.c
+++ b/opcodes/bfin-dis.c
@@ -162,16 +162,7 @@ fmtconst (const_forms_t cf, TIword x, bfd_vma pc, disassemble_info *outf)
     x <<= constant_formats[cf].scale;
 
   if (constant_formats[cf].decimal)
-    {
-      if (constant_formats[cf].leading)
-       {
-         char ps[10];
-         sprintf (ps, "%%%ii", constant_formats[cf].leading);
-         sprintf (buf, ps, x);
-       }
-      else
-       sprintf (buf, "%li", x);
-    }
+    sprintf (buf, "%*li", constant_formats[cf].leading, x);
   else
     {
       if (constant_formats[cf].issigned && x < 0)