sim: 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/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 70d92755ecbb79b77fd137c75aa84a2b3828d0c6..899d0ca776fe1c18491a278503c17ef067c101dc 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/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-04-01  Mike Frysinger  <vapier@gentoo.org>
 
        * machs.c (bfin_model_map_bfrom): Return when mnum is 535.

diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c
index 2c93e04a185121eb0d51db46800f1b6c79a8c4f1..54d6bcad3462e0d5d7f3425c5d05db8f81c91293 100644 (file)
--- a/sim/bfin/bfin-sim.c
+++ b/sim/bfin/bfin-sim.c
@@ -223,16 +223,7 @@ fmtconst_str (const_forms_t cf, bs32 x, bu32 pc)
     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, "%i", x);
-    }
+    sprintf (buf, "%*i", constant_formats[cf].leading, x);
   else
     {
       if (constant_formats[cf].issigned && x < 0)