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

Cleanup: move get_divesite_idx() to divesite.c

Browse source 
This function was defined in divelist.c, whereas it's better located
in divesite.c. Move it.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-02-26 21:14:48 +01:00 • committed by Dirk Hohndel
parent 9c87c0dafd
commit 3c2dd7f7c6
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/divelist.c
View file

@ -512,19 +512,6 @@ int get_divenr(const struct dive *dive)
return -1;
}
int get_divesite_idx(const struct dive_site *ds)
{
int i;
const struct dive_site *d;
// tempting as it may be, don't die when called with dive=NULL
if (ds)
for_each_dive_site(i, d) {
if (d->uuid == ds->uuid) // don't compare pointers, we could be passing in a copy of the dive
return i;
}
return -1;
}
static struct gasmix air = { .o2.permille = O2_IN_AIR, .he.permille = 0 };
/* take into account previous dives until there is a 48h gap between dives */

1
core/divelist.h
View file

@ -34,7 +34,6 @@ extern int dive_table_get_insertion_index(struct dive_table *table, struct dive
extern void add_single_dive(int idx, struct dive *dive);
extern void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2low_p);
extern int get_divenr(const struct dive *dive);
extern int get_divesite_idx(const struct dive_site *ds);
extern struct dive_trip *unregister_dive_from_trip(struct dive *dive);
extern void remove_dive_from_trip(struct dive *dive, struct trip_table *trip_table);
extern dive_trip_t *alloc_trip(void);

13
core/divesite.c
View file

@ -10,6 +10,19 @@
struct dive_site_table dive_site_table;
int get_divesite_idx(const struct dive_site *ds)
{
int i;
const struct dive_site *d;
// tempting as it may be, don't die when called with dive=NULL
if (ds)
for_each_dive_site(i, d) {
if (d->uuid == ds->uuid) // don't compare pointers, we could be passing in a copy of the dive
return i;
}
return -1;
}
struct dive_site *get_dive_site_by_uuid(uint32_t uuid)
{
int i;

1
core/divesite.h
View file

@ -42,6 +42,7 @@ static inline struct dive_site *get_dive_site(int nr)
#define for_each_dive_site(_i, _x) \
for ((_i) = 0; ((_x) = get_dive_site(_i)) != NULL; (_i)++)
int get_divesite_idx(const struct dive_site *ds);
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);