summaryrefslogtreecommitdiffstats
path: root/core/libdivecomputer.c
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-10-04 13:01:26 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-05 12:44:30 -0700
commit426a7f5442db06ddd8953e7ceec12156b91b12dd (patch)
treea1504d067aa9b868136f626ce3842ef691627805 /core/libdivecomputer.c
parentf775ec2e69cff46bb967f46cdb5d47fbb9e69274 (diff)
downloadsubsurface-426a7f5442db06ddd8953e7ceec12156b91b12dd.tar.gz
cleanup: remove DC_FIELD_STRING conditional compilation
This dates from 2014 - this should be obsolete: we certainly don't support such old libdivecomputer versions. Moreover, we bundle our own anyway. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/libdivecomputer.c')
-rw-r--r--core/libdivecomputer.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c
index bca99d377..78030e575 100644
--- a/core/libdivecomputer.c
+++ b/core/libdivecomputer.c
@@ -546,7 +546,6 @@ static uint32_t calculate_diveid(const unsigned char *fingerprint, unsigned int
return csum[0];
}
-#ifdef DC_FIELD_STRING
static uint32_t calculate_string_hash(const char *str)
{
return calculate_diveid((const unsigned char *)str, strlen(str));
@@ -627,7 +626,6 @@ static void parse_string_field(device_data_t *devdata, struct dive *dive, dc_fie
}
}
}
-#endif
static dc_status_t libdc_header_parser(dc_parser_t *parser, device_data_t *devdata, struct dive *dive)
{
@@ -730,7 +728,6 @@ static dc_status_t libdc_header_parser(dc_parser_t *parser, device_data_t *devda
if (rc == DC_STATUS_SUCCESS)
dive->dc.surface_pressure.mbar = lrint(surface_pressure * 1000.0);
-#ifdef DC_FIELD_STRING
// The dive parsing may give us more device information
int idx;
for (idx = 0; idx < 100; idx++) {
@@ -742,7 +739,6 @@ static dc_status_t libdc_header_parser(dc_parser_t *parser, device_data_t *devda
break;
parse_string_field(devdata, dive, &str);
}
-#endif
dc_divemode_t divemode;
rc = dc_parser_get_field(parser, DC_FIELD_DIVEMODE, 0, &divemode);