diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2014-06-01 20:56:29 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-01 20:57:11 -0700 |
commit | 28093ae957548d5fc1e4d373ca0a345cc1be5069 (patch) | |
tree | f8899ae3e24033781bf707ceac959636be063917 /equipment.c | |
parent | ee36bf8bf34013c35120b6c3cc4ae5edcf74b235 (diff) | |
download | subsurface-28093ae957548d5fc1e4d373ca0a345cc1be5069.tar.gz |
Remove is_air() and convert its users to gasmix
Also make gasname() and get_gas_string() global functions (which allows us
to delete code elsewhere).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'equipment.c')
-rw-r--r-- | equipment.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/equipment.c b/equipment.c index a67df68a4..1dd3c3f9d 100644 --- a/equipment.c +++ b/equipment.c @@ -97,6 +97,24 @@ bool cylinder_is_used(struct dive *d, cylinder_t *cyl) return false; } +void get_gas_string(const struct gasmix *gasmix, char *text, int len) +{ + if (gasmix_is_air(gasmix)) + snprintf(text, len, "%s", translate("gettextFromC", "air")); + else if (get_he(gasmix) == 0) + snprintf(text, len, translate("gettextFromC", "EAN%d"), (get_o2(gasmix) + 5) / 10); + else + snprintf(text, len, "(%d/%d)", (get_o2(gasmix) + 5) / 10, (get_he(gasmix) + 5) / 10); +} + +/* Returns a static char buffer - only good for immediate use by printf etc */ +const char *gasname(const struct gasmix *gasmix) +{ + static char gas[64]; + get_gas_string(gasmix, gas, sizeof(gas)); + return gas; +} + bool weightsystem_none(void *_data) { weightsystem_t *ws = _data; |