diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2015-01-11 00:01:15 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-10 17:27:25 -0800 |
| commit | e219bc70f863eaaa9b81ba5abc240975a128c904 (patch) | |
| tree | 682d6d981929420bbabd0021e02db3006c72d96f /load-git.c | |
| parent | bfe05b43407c419a32548af20f40e2b9e3bca045 (diff) | |
| download | subsurface-e219bc70f863eaaa9b81ba5abc240975a128c904.tar.gz | |
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>
Diffstat (limited to 'load-git.c')
| -rw-r--r-- | load-git.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/load-git.c b/load-git.c index 02fc98b68..1cdb44cff 100644 --- a/load-git.c +++ b/load-git.c @@ -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); } |