Dive site: return pointer to dive_site in get_dive_site_*()

As a first step in removing dive-site uuids, change the interface
of the get_dive_site_*() functions to return pointers instead
of uuids. This makes code a bit more complicated in places where
the uuid is extracted afterwards (needed NULL check). Nevertheless,
these places should disappear once pointers instead of uuids are
stored in the dive-structures.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 4 insertions, 4 deletions

diff --git a/core/divesite.h b/core/divesite.h
index d739c4520..d9e2881e4 100644
--- a/core/divesite.h
+++ b/core/divesite.h
@@ -61,10 +61,10 @@ void delete_dive_site(uint32_t id);
 uint32_t create_dive_site(const char *name, timestamp_t divetime);
 uint32_t create_dive_site_from_current_dive(const char *name);
 uint32_t create_dive_site_with_gps(const char *name, const location_t *, timestamp_t divetime);
-uint32_t get_dive_site_uuid_by_name(const char *name, struct dive_site **dsp);
-uint32_t get_dive_site_uuid_by_gps(const location_t *, struct dive_site **dsp);
-uint32_t get_dive_site_uuid_by_gps_and_name(char *name, const location_t *);
-uint32_t get_dive_site_uuid_by_gps_proximity(const location_t *, int distance, struct dive_site **dsp);
+struct dive_site *get_dive_site_by_name(const char *name);
+struct dive_site *get_dive_site_by_gps(const location_t *);
+struct dive_site *get_dive_site_by_gps_and_name(char *name, const location_t *);
+struct dive_site *get_dive_site_by_gps_proximity(const location_t *, int distance);
 bool dive_site_is_empty(struct dive_site *ds);
 void copy_dive_site_taxonomy(struct dive_site *orig, struct dive_site *copy);
 void copy_dive_site(struct dive_site *orig, struct dive_site *copy);