diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-28 10:06:43 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-03-28 13:47:31 -0700 |
| commit | 1b05d28944ef72a62e788efdac2dcdc2dc4771ef (patch) | |
| tree | d5370ac643f1087d9d794a43485658dc2f848574 /statistics.c | |
| parent | 99070c49e2ed1834c7371ce7500d78895e85e67c (diff) | |
| download | subsurface-1b05d28944ef72a62e788efdac2dcdc2dc4771ef.tar.gz | |
Use the new get_o2()/get_he() helper functions more widely
They do the "02=0 means air" thing autmatically, and make for less
typing. So use them more widely in places that looked up the o2 and he
permille values of a gasmix.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'statistics.c')
| -rw-r--r-- | statistics.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/statistics.c b/statistics.c index 0ce8f6afe..a39799a08 100644 --- a/statistics.c +++ b/statistics.c @@ -610,13 +610,13 @@ static void show_single_dive_stats(struct dive *dive) end = cyl->end.mbar ?cyl->sample_end : cyl->sample_end; if (!cylinder_none(cyl)) { /* 0% O2 strangely means air, so 21% - I don't like that at all */ - int o2 = cyl->gasmix.o2.permille ? : O2_IN_AIR; + int o2 = get_o2(&cyl->gasmix); + int he = get_he(&cyl->gasmix); if (offset > 0) { snprintf(buf+offset, 80-offset, ", "); offset += 2; } - snprintf(buf+offset, 80-offset, "%d/%d", (o2 + 5) / 10, - (cyl->gasmix.he.permille + 5) / 10); + snprintf(buf+offset, 80-offset, "%d/%d", (o2 + 5) / 10, (he + 5) / 10); offset = strlen(buf); } /* and if we have size, start and end pressure, we can |