From 14ab95608cc0694caff580825666d2009177e0a2 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Tue, 23 Oct 2018 18:31:39 +0200
Subject: Dive site: pass dive-site pointer to nr_of_dives_at_dive_site()
Instead of passing a uuid, pass a pointer to the dive site.
This is small step in an effort to remove uuids.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
core/divesite.c | 6 ++++--
core/divesite.h | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'core')
diff --git a/core/divesite.c b/core/divesite.c
index f6e96e3c5..437605b71 100644
--- a/core/divesite.c
+++ b/core/divesite.c
@@ -130,13 +130,15 @@ struct dive_site *alloc_or_get_dive_site(uint32_t uuid)
return ds;
}
-int nr_of_dives_at_dive_site(uint32_t uuid, bool select_only)
+int nr_of_dives_at_dive_site(struct dive_site *ds, bool select_only)
{
int j;
int nr = 0;
struct dive *d;
+ if (!ds)
+ return 0;
for_each_dive(j, d) {
- if (d->dive_site_uuid == uuid && (!select_only || d->selected)) {
+ if (d->dive_site_uuid == ds->uuid && (!select_only || d->selected)) {
nr++;
}
}
diff --git a/core/divesite.h b/core/divesite.h
index 0b21d69af..f5754f5da 100644
--- a/core/divesite.h
+++ b/core/divesite.h
@@ -54,7 +54,7 @@ static inline struct dive_site *get_dive_site_by_uuid(uint32_t uuid)
void dive_site_table_sort();
struct dive_site *alloc_or_get_dive_site(uint32_t uuid);
-int nr_of_dives_at_dive_site(uint32_t uuid, bool select_only);
+int nr_of_dives_at_dive_site(struct dive_site *ds, bool select_only);
bool is_dive_site_used(uint32_t uuid, bool select_only);
void free_dive_site(struct dive_site *ds);
void delete_dive_site(uint32_t id);
--
cgit v1.2.3-70-g09d2