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

Core: replace tripflag by notrip boolean

Browse source 
The only remaining use of the tripflag was to mark dives that
were removed explicitly from a trip, i.e. shouldn't be autogrouped.
Therefore replace the enum by a simple boolean.

Currently, there is no way of unsetting the notrip flag. But this
shouldn't result in a user-visible change.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-11-18 11:15:32 +01:00 • committed by Dirk Hohndel
parent 3b9e0b5931
commit 6bf4120dbb
9 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/parse-xml.c
View file

@ -565,9 +565,9 @@ static void dive_site(char *buffer, struct dive_site **ds)
*ds = get_dive_site_by_uuid(uuid);
}
static void get_tripflag(char *buffer, tripflag_t *tf)
static void get_notrip(char *buffer, bool *notrip)
{
*tf = strcmp(buffer, "NOTRIP") ? TF_NONE : NO_TRIP;
*notrip = !strcmp(buffer, "NOTRIP");
}
/*
@ -1241,7 +1241,7 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf, str
return;
if (MATCH("tags", divetags, &dive->tag_list))
return;
if (MATCH("tripflag", get_tripflag, &dive->tripflag))
if (MATCH("tripflag", get_notrip, &dive->notrip))
return;
if (MATCH_STATE("date", divedate, &dive->when))
return;