mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-07 19:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: autogenerate remove_dive() and remove_trip()

Browse source 
The other dive- and trip-table functions were already autogenerated.
Let's do the same for these two.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-10 20:28:50 +01:00 • committed by Dirk Hohndel
parent dc9427d16a
commit efb770c979
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dive.h
View file

@ -407,7 +407,7 @@ struct dive *unregister_dive(int idx);
extern void delete_single_dive(int idx); extern void delete_single_dive(int idx);
extern void insert_trip(dive_trip_t *trip, struct trip_table *trip_table_arg); extern void insert_trip(dive_trip_t *trip, struct trip_table *trip_table_arg);
extern void remove_trip(dive_trip_t *trip, struct trip_table *trip_table_arg); extern void remove_trip(const dive_trip_t *trip, struct trip_table *trip_table_arg);
extern void free_trip(dive_trip_t *trip); extern void free_trip(dive_trip_t *trip);
extern timestamp_t trip_date(const struct dive_trip *trip); extern timestamp_t trip_date(const struct dive_trip *trip);

26
core/divelist.c
View file

@ -915,12 +915,16 @@ static MAKE_GET_IDX(trip_table, struct dive_trip *, trips)
MAKE_SORT(dive_table, struct dive *, dives, comp_dives) MAKE_SORT(dive_table, struct dive *, dives, comp_dives)
MAKE_SORT(trip_table, struct dive_trip *, trips, comp_trips) MAKE_SORT(trip_table, struct dive_trip *, trips, comp_trips)
void remove_dive(const struct dive *dive, struct dive_table *table) #define MAKE_REMOVE(table_type, item_type, item_name) \
{ void remove_##item_name(const item_type item, struct table_type *table) \
int idx = get_idx_in_dive_table(table, dive); { \
if (idx >= 0) int idx = get_idx_in_##table_type(table, item); \
remove_from_dive_table(table, idx); if (idx >= 0) \
} remove_from_##table_type(table, idx); \
}
MAKE_REMOVE(dive_table, struct dive *, dive)
MAKE_REMOVE(trip_table, struct dive_trip *, trip)
/* remove a dive from the trip it's associated to, but don't delete the /* remove a dive from the trip it's associated to, but don't delete the
* trip if this was the last dive in the trip. the caller is responsible * trip if this was the last dive in the trip. the caller is responsible
@ -1001,16 +1005,6 @@ dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive, struct trip_tab
return dive_trip; return dive_trip;
} }
/* remove trip from the trip-list, but don't free its memory.
* caller takes ownership of the trip. */
void remove_trip(dive_trip_t *trip, struct trip_table *trip_table_arg)
{
int idx = get_idx_in_trip_table(trip_table_arg, trip);
assert(!trip->dives.nr);
if (idx >= 0)
remove_from_trip_table(trip_table_arg, idx);
}
/* /*
* Find a trip a new dive should be autogrouped with. If no such trips * Find a trip a new dive should be autogrouped with. If no such trips
* exist, allocate a new trip. The bool "*allocated" is set to true * exist, allocate a new trip. The bool "*allocated" is set to true