empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(out5): Rev. 1.36. didn't fully fix the format conditional.

Browse source 
Fold negative cases into positive ones.
This commit is contained in:
Markus Armbruster 2006-09-23 15:47:40 +00:00
parent dbfd0c5aa3
commit 7d90028f20
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/lib/commands/powe.c
View file

@ -36,6 +36,7 @@
#include <config.h> #include <config.h>
#include <math.h>
#ifdef _WIN32 #ifdef _WIN32
#include <io.h> #include <io.h>
#endif #endif
@ -172,23 +173,20 @@ prpower(char *name, struct powstr *pow, int round_flag)
static void static void
out5(double value, int round_val, int round_flag) out5(double value, int round_val, int round_flag)
{ {
double aval;
if (value > round_val && round_flag) if (value > round_val && round_flag)
value = (int)(value / round_val + 0.5) * round_val; value = (int)(value / round_val + 0.5) * round_val;
if (value < -9999.5e3) aval = fabs(value);
pr("%4.0fM", value / 1e6); if (aval < 1000.)
else if (value < -9950.)
pr("%4.0fK", value / 1000.);
else if (value < -999.)
pr("%4.1fK", value / 1000.);
else if (value < 1000.)
pr("%4.0f ", value); pr("%4.0f ", value);
else if (value < 9.95e3) else if (aval < 9.95e3)
pr("%4.1fK", value / 1000.); pr("%4.1fK", value / 1e3);
else if (value < 9999.5e3) else if (aval < 999.5e3)
pr("%4.0fK", value / 1000.); pr("%4.0fK", value / 1e3);
else if (value < 9.95e6) else if (aval < 9.95e6)
pr("%4.1fM", value / 1e6); pr("%4.1fM", value / 1e6);
else if (value < 9999.5e6) else if (aval < 999.5e6)
pr("%4.0fM", value / 1e6); pr("%4.0fM", value / 1e6);
else else
pr("%4.0fG", value / 1e9); pr("%4.0fG", value / 1e9);