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

Cleanup: use add_to_dive_table() in record_dive_to_table()

Browse source 
This was reimplementing functionality that was already there.
Simply call the already existing function.

Thus, we don't have to export the grow_dive_table function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-06-04 21:25:42 +02:00 • committed by Dirk Hohndel
parent 3df32044ee
commit d129085b59
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/divelist.c
View file

@ -775,7 +775,7 @@ int comp_dives(const struct dive *a, const struct dive *b)
} }
/* Dive table functions */ /* Dive table functions */
MAKE_GROW_TABLE(dive_table, struct dive *, dives) static MAKE_GROW_TABLE(dive_table, struct dive *, dives)
MAKE_GET_INSERTION_INDEX(dive_table, struct dive *, dives, dive_less_than) MAKE_GET_INSERTION_INDEX(dive_table, struct dive *, dives, dive_less_than)
MAKE_ADD_TO(dive_table, struct dive *, dives) MAKE_ADD_TO(dive_table, struct dive *, dives)
static MAKE_REMOVE_FROM(dive_table, dives) static MAKE_REMOVE_FROM(dive_table, dives)

1
core/divelist.h
View file

@ -31,7 +31,6 @@ extern void process_imported_dives(struct dive_table *import_table, struct trip_
struct trip_table *trips_to_add, struct dive_site_table *sites_to_add); struct trip_table *trips_to_add, struct dive_site_table *sites_to_add);
extern char *get_dive_gas_string(const struct dive *dive); extern char *get_dive_gas_string(const struct dive *dive);
extern struct dive **grow_dive_table(struct dive_table *table);
extern int dive_table_get_insertion_index(struct dive_table *table, struct dive *dive); extern int dive_table_get_insertion_index(struct dive_table *table, struct dive *dive);
extern void add_to_dive_table(struct dive_table *table, int idx, struct dive *dive); extern void add_to_dive_table(struct dive_table *table, int idx, struct dive *dive);
extern void append_dive(struct dive *dive); extern void append_dive(struct dive *dive);

7
core/parse.c
View file

@ -78,12 +78,7 @@ int trimspace(char *buffer)
*/ */
void record_dive_to_table(struct dive *dive, struct dive_table *table) void record_dive_to_table(struct dive *dive, struct dive_table *table)
{ {
assert(table != NULL); add_to_dive_table(table, table->nr, fixup_dive(dive));
struct dive **dives = grow_dive_table(table);
int nr = table->nr;
dives[nr] = fixup_dive(dive);
table->nr = nr + 1;
} }
void record_dive(struct dive *dive) void record_dive(struct dive *dive)