summaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2014-02-12 14:19:53 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-02-12 17:41:49 -0800
commit23baf20f569f1f34ab4efa68996f24c3ad49fe05 (patch)
treedc10775b82b6f0e69d36bafeec54430bdec8126b /dive.c
parent7ae05b4f710fc0d03a2198397e7dd779f477fd79 (diff)
downloadsubsurface-23baf20f569f1f34ab4efa68996f24c3ad49fe05.tar.gz
Use "rint()" instead of rounding manually with "+ 0.5"
rint() is "round to nearest integer", and does a better job than +0.5 (followed by the implicit truncation inherent in integer casting). We already used 'rint()' for values that could be negative (where +0.5 is actively wrong), let's just make it consistent. Of course, as is usual for the messy C math functions, it depends on the current rounding mode. But the default round-to-nearest is what we want and use, and the functions that explicitly always round to nearest aren't standard enough to worry about. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dive.c b/dive.c
index 455b1288c..edcb130f4 100644
--- a/dive.c
+++ b/dive.c
@@ -549,7 +549,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
volume_of_air = cuft_to_l(type->size.mliter);
/* milliliters at 1 atm: "true size" */
volume = volume_of_air / surface_volume_multiplier(type->workingpressure);
- type->size.mliter = volume + 0.5;
+ type->size.mliter = rint(volume);
}
/* Ok, we have both size and pressure: try to match a description */