mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
e20ec9248c
46cf2fc086 fixed a bug where clearing of a divelog, such as the one
used for import, would erase dives in the global(!) divelog.
However, the new code used the function clear_dive_table(), which
only cleared the table without unregistering the dives. In particular,
the dives were not removed from the trips, which means that the trips
were not free()d.
This reinstates the old code, but now passes a divelog paremeter
to delete_single_dive() instead of accessing the global divelog.
Moreover, delete dives from the back to avoid unnecessary
copying.
An alternative and definitely simpler solution might be to just
add a "clear_trip_table()" after "clear_dive_table()".
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
71 lines
2.4 KiB
C
71 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DIVELIST_H
|
|
#define DIVELIST_H
|
|
|
|
#include "units.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct dive;
|
|
struct divelog;
|
|
struct trip_table;
|
|
struct dive_site_table;
|
|
struct device_table;
|
|
struct deco_state;
|
|
|
|
struct dive_table {
|
|
int nr, allocated;
|
|
struct dive **dives;
|
|
};
|
|
static const struct dive_table empty_dive_table = { 0, 0, (struct dive **)0 };
|
|
|
|
/* this is used for both git and xml format */
|
|
#define DATAFORMAT_VERSION 3
|
|
|
|
extern void sort_dive_table(struct dive_table *table);
|
|
extern void update_cylinder_related_info(struct dive *);
|
|
extern int init_decompression(struct deco_state *ds, const struct dive *dive, bool in_planner);
|
|
|
|
/* divelist core logic functions */
|
|
extern void process_loaded_dives();
|
|
/* flags for process_imported_dives() */
|
|
#define IMPORT_PREFER_IMPORTED (1 << 0)
|
|
#define IMPORT_IS_DOWNLOADED (1 << 1)
|
|
#define IMPORT_MERGE_ALL_TRIPS (1 << 2)
|
|
#define IMPORT_ADD_TO_NEW_TRIP (1 << 3)
|
|
extern void add_imported_dives(struct divelog *log, int flags);
|
|
extern void process_imported_dives(struct divelog *import_log, int flags,
|
|
struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
|
|
struct trip_table *trips_to_add, struct dive_site_table *sites_to_add,
|
|
struct device_table *devices_to_add);
|
|
|
|
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 insert_dive(struct dive_table *table, struct dive *d);
|
|
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 remove_dive(const struct dive *dive, struct dive_table *table);
|
|
extern int get_dive_nr_at_idx(int idx);
|
|
extern timestamp_t get_surface_interval(timestamp_t when);
|
|
extern void delete_dive_from_table(struct dive_table *table, int idx);
|
|
extern struct dive *find_next_visible_dive(timestamp_t when);
|
|
|
|
extern int comp_dives(const struct dive *a, const struct dive *b);
|
|
|
|
int get_min_datafile_version();
|
|
void reset_min_datafile_version();
|
|
void report_datafile_version(int version);
|
|
int get_dive_id_closest_to(timestamp_t when);
|
|
void clear_dive_file_data();
|
|
void clear_dive_table(struct dive_table *table);
|
|
void move_dive_table(struct dive_table *src, struct dive_table *dst);
|
|
struct dive *unregister_dive(int idx);
|
|
extern bool has_dive(unsigned int deviceid, unsigned int diveid);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif // DIVELIST_H
|