mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove is_air() and convert its users to gasmix

Browse source 
Also make gasname() and get_gas_string() global functions (which allows us
to delete code elsewhere).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-01 20:56:29 -07:00
parent ee36bf8bf3
commit 28093ae957
5 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
statistics.c
View file

@ -337,7 +337,6 @@ char *get_gaslist(struct dive *dive)
{
int idx, offset = 0;
static char buf[MAXBUF];
int o2, he;
buf[0] = '\0';
for (idx = 0; idx < MAX_CYLINDERS; idx++) {
@ -345,20 +344,11 @@ char *get_gaslist(struct dive *dive)
if (!is_gas_used(dive, idx))
continue;
cyl = &dive->cylinder[idx];
o2 = get_o2(&cyl->gasmix);
he = get_he(&cyl->gasmix);
if (offset > 0) {
strncpy(buf + offset, "\n", MAXBUF - offset);
offset = strlen(buf);
}
if (is_air(o2, he))
strncpy(buf + offset, translate("gettextFromC", "air"), MAXBUF - offset);
else if (he == 0)
snprintf(buf + offset, MAXBUF - offset,
translate("gettextFromC", "EAN%d"), (o2 + 5) / 10);
else
snprintf(buf + offset, MAXBUF - offset,
"%d/%d", (o2 + 5) / 10, (he + 5) / 10);
strncpy(buf + offset, gasname(&cyl->gasmix), MAXBUF - offset);
offset = strlen(buf);
}
if (*buf == '\0')