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: replace is_dive_site_used() by is_dive_site_selected()

Browse source 
is_dive_site_used() had a "selected" parameter. If true it would
return whether the given dive site had a selected dive. Turns
out all callers had this parameter set to true. Therefore, replace
by a simplified function without the "selected" parameter and
give the function an appropriate name.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-09-21 13:41:45 +02:00 • committed by Dirk Hohndel
parent e46e018e21
commit 9c48130d37
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/divesite.c
View file

@ -191,13 +191,10 @@ int nr_of_dives_at_dive_site(struct dive_site *ds)
return ds->dives.nr; return ds->dives.nr;
} }
bool is_dive_site_used(struct dive_site *ds, bool select_only) bool is_dive_site_selected(struct dive_site *ds)
{ {
int i; int i;
if (!select_only)
return ds->dives.nr > 0;
for (i = 0; i < ds->dives.nr; i++) { for (i = 0; i < ds->dives.nr; i++) {
if (ds->dives.dives[i]->selected) if (ds->dives.dives[i]->selected)
return true; return true;

2
core/divesite.h
View file

@ -51,7 +51,7 @@ int add_dive_site_to_table(struct dive_site *ds, struct dive_site_table *ds_tabl
struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table); struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table);
struct dive_site *alloc_dive_site(); struct dive_site *alloc_dive_site();
int nr_of_dives_at_dive_site(struct dive_site *ds); int nr_of_dives_at_dive_site(struct dive_site *ds);
bool is_dive_site_used(struct dive_site *ds, bool select_only); bool is_dive_site_selected(struct dive_site *ds);
void free_dive_site(struct dive_site *ds); void free_dive_site(struct dive_site *ds);
int unregister_dive_site(struct dive_site *ds); int unregister_dive_site(struct dive_site *ds);
int register_dive_site(struct dive_site *ds); int register_dive_site(struct dive_site *ds);

4
core/save-xml.c
View file

@ -608,7 +608,7 @@ static void save_dives_buffer(struct membuffer *b, const bool select_only, bool
if (dive_site_is_empty(ds)) if (dive_site_is_empty(ds))
continue; continue;
/* Only write used dive sites when exporting selected dives */ /* Only write used dive sites when exporting selected dives */
if (select_only && !is_dive_site_used(ds, true)) if (select_only && !is_dive_site_selected(ds))
continue; continue;
put_format(b, "<site uuid='%8x'", ds->uuid); put_format(b, "<site uuid='%8x'", ds->uuid);
@ -823,7 +823,7 @@ static void save_dive_sites_buffer(struct membuffer *b, const bool select_only,
if (dive_site_is_empty(ds)) if (dive_site_is_empty(ds))
continue; continue;
/* Only write used dive sites when exporting selected dives */ /* Only write used dive sites when exporting selected dives */
if (select_only && !is_dive_site_used(ds, true)) if (select_only && !is_dive_site_selected(ds))
continue; continue;
put_format(b, "<site uuid='%8x'", ds->uuid); put_format(b, "<site uuid='%8x'", ds->uuid);