diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-23 13:29:04 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | d3a7c5448fe166444980ed41757c9e03d83ece2f (patch) | |
| tree | 7a2a4f05b808705cd27845335876184f87243b5c /core/load-git.c | |
| parent | ae6239bfec75df8a6795c2cc0017fcb0148e01e5 (diff) | |
| download | subsurface-d3a7c5448fe166444980ed41757c9e03d83ece2f.tar.gz | |
Dive site: return pointer to dive_site in create_dive_site_*()
This changes more of the dive-site interface to return pointers
instead of UUIDs. Currently, most call sites directly extract
UUIDs afterwards. Ultimately, the UUIDs will be generally replaced
by pointers, which will then simplify these callers.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/load-git.c')
| -rw-r--r-- | core/load-git.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/load-git.c b/core/load-git.c index f040f9de6..b0d94f3cf 100644 --- a/core/load-git.c +++ b/core/load-git.c @@ -159,7 +159,7 @@ static void parse_dive_gps(char *line, struct membuffer *str, void *_dive) if (!ds) { ds = get_dive_site_by_gps(&location); if (!ds) - dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when); + dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when)->uuid; else dive->dive_site_uuid = ds->uuid; } else { @@ -183,7 +183,7 @@ static void parse_dive_location(char *line, struct membuffer *str, void *_dive) if (!ds) { ds = get_dive_site_by_name(name); if (!ds) - dive->dive_site_uuid = create_dive_site(name, dive->when); + dive->dive_site_uuid = create_dive_site(name, dive->when)->uuid; else dive->dive_site_uuid = ds->uuid; } else { |