mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Refactor dctype -> divemode
... and repair a failed rebase (sorry). Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
bfe05b4340
commit
e219bc70f8
18 changed files with 204 additions and 184 deletions
|
@ -133,7 +133,7 @@ static duration_t get_duration(const char *line)
|
|||
static enum dive_comp_type get_dctype(const char *line)
|
||||
{
|
||||
for (enum dive_comp_type i = 0; i < NUM_DC_TYPE; i++) {
|
||||
if (strcmp(line, dctype_text[i]) == 0)
|
||||
if (strcmp(line, divemode_text[i]) == 0)
|
||||
return i;
|
||||
}
|
||||
return 0;
|
||||
|
@ -528,7 +528,7 @@ static void parse_dc_duration(char *line, struct membuffer *str, void *_dc)
|
|||
{ struct divecomputer *dc = _dc; dc->duration = get_duration(line); }
|
||||
|
||||
static void parse_dc_dctype(char *line, struct membuffer *str, void *_dc)
|
||||
{ struct divecomputer *dc = _dc; dc->dctype = get_dctype(line); }
|
||||
{ struct divecomputer *dc = _dc; dc->divemode = get_dctype(line); }
|
||||
|
||||
static void parse_dc_maxdepth(char *line, struct membuffer *str, void *_dc)
|
||||
{ struct divecomputer *dc = _dc; dc->maxdepth = get_depth(line); }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue