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

cleanup: remove DC_FIELD_STRING conditional compilation

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2020-10-04 13:01:26 +02:00 • committed by Dirk Hohndel
parent f775ec2e69
commit 426a7f5442
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/libdivecomputer.c
View file

@ -546,7 +546,6 @@ static uint32_t calculate_diveid(const unsigned char *fingerprint, unsigned int
return csum[0]; return csum[0];
} }
#ifdef DC_FIELD_STRING
static uint32_t calculate_string_hash(const char *str) static uint32_t calculate_string_hash(const char *str)
{ {
return calculate_diveid((const unsigned char *)str, strlen(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) 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) if (rc == DC_STATUS_SUCCESS)
dive->dc.surface_pressure.mbar = lrint(surface_pressure * 1000.0); dive->dc.surface_pressure.mbar = lrint(surface_pressure * 1000.0);
#ifdef DC_FIELD_STRING
// The dive parsing may give us more device information // The dive parsing may give us more device information
int idx; int idx;
for (idx = 0; idx < 100; 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; break;
parse_string_field(devdata, dive, &str); parse_string_field(devdata, dive, &str);
} }
#endif
dc_divemode_t divemode; dc_divemode_t divemode;
rc = dc_parser_get_field(parser, DC_FIELD_DIVEMODE, 0, &divemode); rc = dc_parser_get_field(parser, DC_FIELD_DIVEMODE, 0, &divemode);