Changeset de65624 in mainline

Timestamp:

2019-10-08T12:04:16Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a163d10

Parents:

cf9a1e2

git-author:

Jiri Svoboda <jiri@…> (2019-10-09 06:04:09)

git-committer:

Jiri Svoboda <jiri@…> (2019-10-08 12:04:16)

Message:

Fix too many integer digits when rounding capacity up

Apparently, capacity_format test could never have passed.

File:

• uspace/lib/c/generic/capa.c (modified) (3 diffs)

uspace/lib/c/generic/capa.c

@@ -153 +153 @@
         assert(rc == EOK);
 
+        /* Change units until we have no more than scapa_max_idig integer digits */
         while (capa->m / div >= maxv) {
                 ++capa->cunit;
@@ -170 +171 @@
                 assert(rc == EOK);
 
+                /* Division with rounding */
                 capa->m = (capa->m + (div / 2)) / div;
                 capa->dp -= rdig;
+        }
+
+        /*
+         * If we rounded up from something like 999.95 to 1000.0,, we still
+         * have more than scapa_max_idig integer digits and need to change
+         * units once more.
+         */
+        rc = ipow10_u64(capa->dp, &div);
+        assert(rc == EOK);
+
+        if (capa->m / div >= 1000) {
+                ++capa->cunit;
+                capa->dp += 3;
+
+                /*
+                 * We now have one more significant digit than we want
+                 * so round to one less digits
+                 */
+                capa->m = (capa->m + 5) / 10;
+                --capa->dp;
         }
 }
@@ -202 +224 @@
                 ret = asprintf(rstr, "%" PRIu64 " %s", ipart, sunit);
         }
+
         if (ret < 0)
                 return ENOMEM;