diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-26 17:03:54 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-29 00:09:31 +0000 |
| commit | 724055f0af4fb7cdb9f1570967fe4b34797f3419 (patch) | |
| tree | 6aab8c34e7d0a6df1d6fe84bc5794e8eb5404b7d /core/datatrak.c | |
| parent | acd44467c1100a1a774cc644921b1dc33dca1266 (diff) | |
| download | subsurface-724055f0af4fb7cdb9f1570967fe4b34797f3419.tar.gz | |
Dive site: replace dive->dive_site_uuid by dive_site
Replace the UUID reference of struct dive by a pointer to dive_site.
This commit is rather large in lines, but nevertheless quite simple
since most of the UUID->pointer work was done in previous commits.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/datatrak.c')
| -rw-r--r-- | core/datatrak.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/datatrak.c b/core/datatrak.c index 98cfcb795..1c6cd8bb1 100644 --- a/core/datatrak.c +++ b/core/datatrak.c @@ -202,9 +202,9 @@ unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive) */ snprintf(buffer, sizeof(buffer), "%s, %s", locality, dive_point); ds = get_dive_site_by_name(buffer); - dt_dive->dive_site_uuid = ds ? ds->uuid : 0; - if (dt_dive->dive_site_uuid == 0) - dt_dive->dive_site_uuid = create_dive_site(buffer, dt_dive->when)->uuid; + dt_dive->dive_site = ds; + if (!dt_dive->dive_site) + dt_dive->dive_site = create_dive_site(buffer, dt_dive->when); free(locality); locality = NULL; free(dive_point); |