diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-25 11:44:05 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2012-11-25 13:05:14 -0800 |
| commit | 7bfc8de55e0476b5604496839d920db597490a83 (patch) | |
| tree | 6dbba6e15874836b2368a473280b24520682eb4a | |
| parent | 1ca1fe7994799ec7786a53914d713e51d56f87a3 (diff) | |
| download | subsurface-7bfc8de55e0476b5604496839d920db597490a83.tar.gz | |
Do not set the water salinity of a dive unless libdivecomputer supports it
It's annoying to see water salinity data in the XML that isn't relevant,
and adding the default value just because the dive got downloaded from
libdivecomputer is definitely wrong.
We should set the water salinity explicitly only if we have it
explicitly set on the dive computer.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | libdivecomputer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index 3325c68ff..164b3a30f 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -332,17 +332,17 @@ static int dive_cb(const unsigned char *data, unsigned int size, return rc; } +#ifdef DC_FIELD_SALINITY // Check if the libdivecomputer version already supports salinity double salinity = 1.03; -#ifdef DC_FIELD_SALINITY rc = dc_parser_get_field(parser, DC_FIELD_SALINITY, 0, &salinity); if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) { dev_info(devdata, _("Error obtaining water salinity")); dc_parser_destroy(parser); return rc; } -#endif dive->salinity = salinity * 10000.0 + 0.5; +#endif rc = parse_gasmixes(devdata, dive, parser, ngases); if (rc != DC_STATUS_SUCCESS) { |