Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From e6f1a85c0a3df24fe3ca9a520dc697105e75a80c Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrea Adami <andrea.adami@gmail.com> |
| 3 | Date: Sat, 27 Jan 2018 09:39:26 +0100 |
| 4 | Subject: [PATCH 8/9] ubi-utils: ubiformat.c: convert to integer arithmetic |
| 5 | |
| 6 | Do not cast percent to double, it is just used as upper limit. |
| 7 | Avoid floating point to fix compilation for aarch64 against klibc: |
| 8 | |
| 9 | error: '-mgeneral-regs-only' is incompatible with floating-point code |
| 10 | | int percent = ((double)si->ok_cnt)/si->good_cnt * 100; |
| 11 | | ^~~~~~~ |
| 12 | |
| 13 | Notes: |
| 14 | * The checks in the code above this line ensure that si->good_cnt is not 0. |
| 15 | |
| 16 | * The code assumes si->good_cnt * 100 will not overflow, then we can use |
| 17 | (si->ok_cnt * 100) safely because the former is bigger. |
| 18 | |
| 19 | * The truncated result does not affect the logic: |
| 20 | i.e. a value of 49.9 is truncated to 49 and is still <50. |
| 21 | |
| 22 | Upstream-Status: Submitted |
| 23 | |
| 24 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
| 25 | --- |
| 26 | ubi-utils/ubiformat.c | 2 +- |
| 27 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 28 | |
| 29 | diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c |
| 30 | index 21409ca..d93164a 100644 |
| 31 | --- a/ubi-utils/ubiformat.c |
| 32 | +++ b/ubi-utils/ubiformat.c |
| 33 | @@ -843,7 +843,7 @@ int main(int argc, char * const argv[]) |
| 34 | } |
| 35 | |
| 36 | if (!args.override_ec && si->empty_cnt < si->good_cnt) { |
| 37 | - int percent = ((double)si->ok_cnt)/si->good_cnt * 100; |
| 38 | + int percent = (si->ok_cnt * 100) / si->good_cnt; |
| 39 | |
| 40 | /* |
| 41 | * Make sure the majority of eraseblocks have valid |
| 42 | -- |
| 43 | 2.7.4 |
| 44 | |