From 2fa7a0570bc9a5dc033457ce1769a90db0d3c990 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Apr 2012 04:23:40 +0000 Subject: [PATCH] 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 --- sim/bfin/ChangeLog | 5 +++++ sim/bfin/bfin-sim.c | 11 +---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 70d9275..899d0ca 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,10 @@ 2012-04-01 Mike Frysinger + * bfin-dis.c (fmtconst): Replace decimal handling with a single + sprintf call and the '*' field width. + +2012-04-01 Mike Frysinger + * machs.c (bfin_model_map_bfrom): Return when mnum is 535. 2012-04-01 Mike Frysinger diff --git a/sim/bfin/bfin-sim.c b/sim/bfin/bfin-sim.c index 2c93e04..54d6bca 100644 --- 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) -- 2.7.4