From 068a4cbf264102f4ede4c3805eecbacf15f0f2d8 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 16 Feb 2011 21:42:13 -0800 Subject: [PATCH] data-out: Reorganize output_Z() to be more easily understood. It took me a minute to figure out what was going on here, so this commit slightly reorganizes it. --- src/data/data-out.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/data-out.c b/src/data/data-out.c index bb774374..1ed83bcb 100644 --- a/src/data/data-out.c +++ b/src/data/data-out.c @@ -215,11 +215,9 @@ output_Z (const union value *input, const struct fmt_spec *format, char buf[128]; if (input->f == SYSMIS) output_missing (format, output); - else if (fabs (number) >= power10 (format->w) - || sprintf (buf, "%0*.0f", format->w, - fabs (round (number))) != format->w) - output_overflow (format, output); - else + else if (fabs (number) < power10 (format->w) + && sprintf (buf, "%0*.0f", format->w, + fabs (round (number))) == format->w) { if (number < 0 && strspn (buf, "0") < format->w) { @@ -229,6 +227,8 @@ output_Z (const union value *input, const struct fmt_spec *format, memcpy (output, buf, format->w); output[format->w] = '\0'; } + else + output_overflow (format, output); } /* Outputs P format. */ -- 2.30.2