mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive site: return pointer to dive_site in create_dive_site_*()

Browse source 
This changes more of the dive-site interface to return pointers
instead of UUIDs. Currently, most call sites directly extract
UUIDs afterwards. Ultimately, the UUIDs will be generally replaced
by pointers, which will then simplify these callers.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-23 13:29:04 +02:00 committed by Dirk Hohndel
parent ae6239bfec
commit d3a7c5448f
16 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/datatrak.c
View file

@ -204,7 +204,7 @@ unsigned char *dt_dive_parser(unsigned char *runner, struct dive *dt_dive)
ds = get_dive_site_by_name(buffer); ds = get_dive_site_by_name(buffer);
dt_dive->dive_site_uuid = ds ? ds->uuid : 0; dt_dive->dive_site_uuid = ds ? ds->uuid : 0;
if (dt_dive->dive_site_uuid == 0) if (dt_dive->dive_site_uuid == 0)
dt_dive->dive_site_uuid = create_dive_site(buffer, dt_dive->when); dt_dive->dive_site_uuid = create_dive_site(buffer, dt_dive->when)->uuid;
free(locality); free(locality);
locality = NULL; locality = NULL;
free(dive_point); free(dive_point);

2
core/dive.c
View file

@ -4080,7 +4080,7 @@ void dive_set_geodata_from_picture(struct dive *dive, struct picture *picture)
if (ds) { if (ds) {
ds->location = picture->location; ds->location = picture->location;
} else { } else {
dive->dive_site_uuid = create_dive_site_with_gps("", &picture->location, dive->when); dive->dive_site_uuid = create_dive_site_with_gps("", &picture->location, dive->when)->uuid;
invalidate_dive_cache(dive); invalidate_dive_cache(dive);
} }
} }

14
core/divesite.c
View file

@ -203,16 +203,16 @@ uint32_t create_divesite_uuid(const char *name, timestamp_t divetime)
} }
/* allocate a new site and add it to the table */ /* allocate a new site and add it to the table */
uint32_t create_dive_site(const char *name, timestamp_t divetime) struct dive_site *create_dive_site(const char *name, timestamp_t divetime)
{ {
uint32_t uuid = create_divesite_uuid(name, divetime); uint32_t uuid = create_divesite_uuid(name, divetime);
struct dive_site *ds = alloc_or_get_dive_site(uuid); struct dive_site *ds = alloc_or_get_dive_site(uuid);
ds->name = copy_string(name); ds->name = copy_string(name);
return uuid; return ds;
} }
/* same as before, but with current time if no current_dive is present */ /* same as before, but with current time if no current_dive is present */
uint32_t create_dive_site_from_current_dive(const char *name) struct dive_site *create_dive_site_from_current_dive(const char *name)
{ {
if (current_dive != NULL) { if (current_dive != NULL) {
return create_dive_site(name, current_dive->when); return create_dive_site(name, current_dive->when);
@ -225,14 +225,14 @@ uint32_t create_dive_site_from_current_dive(const char *name)
} }
/* same as before, but with GPS data */ /* same as before, but with GPS data */
uint32_t create_dive_site_with_gps(const char *name, const location_t *loc, timestamp_t divetime) struct dive_site *create_dive_site_with_gps(const char *name, const location_t *loc, timestamp_t divetime)
{ {
uint32_t uuid = create_divesite_uuid(name, divetime); uint32_t uuid = create_divesite_uuid(name, divetime);
struct dive_site *ds = alloc_or_get_dive_site(uuid); struct dive_site *ds = alloc_or_get_dive_site(uuid);
ds->name = copy_string(name); ds->name = copy_string(name);
ds->location = *loc; ds->location = *loc;
return ds->uuid; return ds;
} }
/* a uuid is always present - but if all the other fields are empty, the dive site is pointless */ /* a uuid is always present - but if all the other fields are empty, the dive site is pointless */
@ -330,7 +330,7 @@ void merge_dive_sites(uint32_t ref, uint32_t* uuids, int count)
mark_divelist_changed(true); mark_divelist_changed(true);
} }
uint32_t find_or_create_dive_site_with_name(const char *name, timestamp_t divetime) struct dive_site *find_or_create_dive_site_with_name(const char *name, timestamp_t divetime)
{ {
int i; int i;
struct dive_site *ds; struct dive_site *ds;
@ -339,7 +339,7 @@ uint32_t find_or_create_dive_site_with_name(const char *name, timestamp_t diveti
break; break;
} }
if (ds) if (ds)
return ds->uuid; return ds;
return create_dive_site(name, divetime); return create_dive_site(name, divetime);
} }

8
core/divesite.h
View file

@ -58,9 +58,9 @@ int nr_of_dives_at_dive_site(uint32_t uuid, bool select_only);
bool is_dive_site_used(uint32_t uuid, bool select_only); bool is_dive_site_used(uint32_t uuid, bool select_only);
void free_dive_site(struct dive_site *ds); void free_dive_site(struct dive_site *ds);
void delete_dive_site(uint32_t id); void delete_dive_site(uint32_t id);
uint32_t create_dive_site(const char *name, timestamp_t divetime); struct dive_site *create_dive_site(const char *name, timestamp_t divetime);
uint32_t create_dive_site_from_current_dive(const char *name); struct dive_site *create_dive_site_from_current_dive(const char *name);
uint32_t create_dive_site_with_gps(const char *name, const location_t *, timestamp_t divetime); struct dive_site *create_dive_site_with_gps(const char *name, const location_t *, timestamp_t divetime);
struct dive_site *get_dive_site_by_name(const char *name); struct dive_site *get_dive_site_by_name(const char *name);
struct dive_site *get_dive_site_by_gps(const location_t *); struct dive_site *get_dive_site_by_gps(const location_t *);
struct dive_site *get_dive_site_by_gps_and_name(char *name, const location_t *); struct dive_site *get_dive_site_by_gps_and_name(char *name, const location_t *);
@ -71,7 +71,7 @@ void copy_dive_site(struct dive_site *orig, struct dive_site *copy);
void merge_dive_site(struct dive_site *a, struct dive_site *b); void merge_dive_site(struct dive_site *a, struct dive_site *b);
void clear_dive_site(struct dive_site *ds); void clear_dive_site(struct dive_site *ds);
unsigned int get_distance(const location_t *loc1, const location_t *loc2); unsigned int get_distance(const location_t *loc1, const location_t *loc2);
uint32_t find_or_create_dive_site_with_name(const char *name, timestamp_t divetime); struct dive_site *find_or_create_dive_site_with_name(const char *name, timestamp_t divetime);
void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count); void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count);
#ifdef __cplusplus #ifdef __cplusplus

4
core/gpslocation.cpp
View file

@ -211,8 +211,8 @@ static void copy_gps_location(struct gpsTracker &gps, struct dive *d)
{ {
struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid); struct dive_site *ds = get_dive_site_by_uuid(d->dive_site_uuid);
if (!ds) { if (!ds) {
d->dive_site_uuid = create_dive_site(qPrintable(gps.name), gps.when); ds = create_dive_site(qPrintable(gps.name), gps.when);
ds = get_dive_site_by_uuid(d->dive_site_uuid); d->dive_site_uuid = ds->uuid;
} }
ds->location = gps.location; ds->location = gps.location;
} }

2
core/import-cobalt.c
View file

@ -197,7 +197,7 @@ static int cobalt_dive(void *param, int columns, char **data, char **column)
return 1; return 1;
} }
sprintf(tmp, "%s / %s", location, location_site); sprintf(tmp, "%s / %s", location, location_site);
state->cur_dive->dive_site_uuid = find_or_create_dive_site_with_name(tmp, state->cur_dive->when); state->cur_dive->dive_site_uuid = find_or_create_dive_site_with_name(tmp, state->cur_dive->when)->uuid;
free(tmp); free(tmp);
} }
free(location); free(location);

2
core/import-divinglog.c
View file

@ -287,7 +287,7 @@ static int divinglog_dive(void *param, int columns, char **data, char **column)
state->cur_dive->when = (time_t)(atol(data[1])); state->cur_dive->when = (time_t)(atol(data[1]));
if (data[2]) if (data[2])
state->cur_dive->dive_site_uuid = find_or_create_dive_site_with_name(data[2], state->cur_dive->when); state->cur_dive->dive_site_uuid = find_or_create_dive_site_with_name(data[2], state->cur_dive->when)->uuid;
if (data[3]) if (data[3])
utf8_string(data[3], &state->cur_dive->buddy); utf8_string(data[3], &state->cur_dive->buddy);

2
core/libdivecomputer.c
View file

@ -596,7 +596,7 @@ static void parse_string_field(struct dive *dive, dc_field_string_t *str)
parse_location(line, &location); parse_location(line, &location);
if (location.lat.udeg && location.lon.udeg) if (location.lat.udeg && location.lon.udeg)
dive->dive_site_uuid = create_dive_site_with_gps(str->value, &location, time(NULL)); dive->dive_site_uuid = create_dive_site_with_gps(str->value, &location, time(NULL))->uuid;
} }
} }
#endif #endif

2
core/liquivision.c
View file

@ -227,7 +227,7 @@ static void parse_dives (int log_version, const unsigned char *buf, unsigned int
// now that we have the dive time we can store the divesite // now that we have the dive time we can store the divesite
// (we need the dive time to create deterministic uuids) // (we need the dive time to create deterministic uuids)
if (found_divesite) { if (found_divesite) {
dive->dive_site_uuid = find_or_create_dive_site_with_name(location, dive->when); dive->dive_site_uuid = find_or_create_dive_site_with_name(location, dive->when)->uuid;
free(location); free(location);
} }
//unsigned int end_time = array_uint32_le(buf + ptr); //unsigned int end_time = array_uint32_le(buf + ptr);

4
core/load-git.c
View file

@ -159,7 +159,7 @@ static void parse_dive_gps(char *line, struct membuffer *str, void *_dive)
if (!ds) { if (!ds) {
ds = get_dive_site_by_gps(&location); ds = get_dive_site_by_gps(&location);
if (!ds) if (!ds)
dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when); dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when)->uuid;
else else
dive->dive_site_uuid = ds->uuid; dive->dive_site_uuid = ds->uuid;
} else { } else {
@ -183,7 +183,7 @@ static void parse_dive_location(char *line, struct membuffer *str, void *_dive)
if (!ds) { if (!ds) {
ds = get_dive_site_by_name(name); ds = get_dive_site_by_name(name);
if (!ds) if (!ds)
dive->dive_site_uuid = create_dive_site(name, dive->when); dive->dive_site_uuid = create_dive_site(name, dive->when)->uuid;
else else
dive->dive_site_uuid = ds->uuid; dive->dive_site_uuid = ds->uuid;
} else { } else {

10
core/parse-xml.c
View file

@ -981,7 +981,7 @@ static void divinglog_place(char *place, uint32_t *uuid, struct parser_state *st
if (ds) if (ds)
*uuid = ds->uuid; *uuid = ds->uuid;
else else
*uuid = create_dive_site(buffer, state->cur_dive->when); *uuid = create_dive_site(buffer, state->cur_dive->when)->uuid;
// TODO: capture the country / city info in the taxonomy instead // TODO: capture the country / city info in the taxonomy instead
free(state->city); free(state->city);
@ -1133,7 +1133,7 @@ static void gps_lat(char *buffer, struct dive *dive)
location.lat = parse_degrees(buffer, &end); location.lat = parse_degrees(buffer, &end);
if (!ds) { if (!ds) {
dive->dive_site_uuid = create_dive_site_with_gps(NULL, &location, dive->when); dive->dive_site_uuid = create_dive_site_with_gps(NULL, &location, dive->when)->uuid;
} else { } else {
if (ds->location.lat.udeg && ds->location.lat.udeg != location.lat.udeg) if (ds->location.lat.udeg && ds->location.lat.udeg != location.lat.udeg)
fprintf(stderr, "Oops, changing the latitude of existing dive site id %8x name %s; not good\n", ds->uuid, ds->name ?: "(unknown)"); fprintf(stderr, "Oops, changing the latitude of existing dive site id %8x name %s; not good\n", ds->uuid, ds->name ?: "(unknown)");
@ -1149,7 +1149,7 @@ static void gps_long(char *buffer, struct dive *dive)
location.lon = parse_degrees(buffer, &end); location.lon = parse_degrees(buffer, &end);
if (!ds) { if (!ds) {
dive->dive_site_uuid = create_dive_site_with_gps(NULL, &location, dive->when); dive->dive_site_uuid = create_dive_site_with_gps(NULL, &location, dive->when)->uuid;
} else { } else {
if (ds->location.lon.udeg && ds->location.lon.udeg != location.lon.udeg) if (ds->location.lon.udeg && ds->location.lon.udeg != location.lon.udeg)
fprintf(stderr, "Oops, changing the longitude of existing dive site id %8x name %s; not good\n", ds->uuid, ds->name ?: "(unknown)"); fprintf(stderr, "Oops, changing the longitude of existing dive site id %8x name %s; not good\n", ds->uuid, ds->name ?: "(unknown)");
@ -1189,7 +1189,7 @@ static void gps_in_dive(char *buffer, struct dive *dive, struct parser_state *st
state->cur_location = location; state->cur_location = location;
dive->dive_site_uuid = ds->uuid; dive->dive_site_uuid = ds->uuid;
} else { } else {
dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when); dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when)->uuid;
} }
} else { } else {
ds = get_dive_site_by_uuid(uuid); ds = get_dive_site_by_uuid(uuid);
@ -2120,7 +2120,7 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *tabl
/* Measure GPS */ /* Measure GPS */
state.cur_location.lat.udeg = (int)((ptr[7] << 24) + (ptr[6] << 16) + (ptr[5] << 8) + (ptr[4] << 0)); state.cur_location.lat.udeg = (int)((ptr[7] << 24) + (ptr[6] << 16) + (ptr[5] << 8) + (ptr[4] << 0));
state.cur_location.lon.udeg = (int)((ptr[11] << 24) + (ptr[10] << 16) + (ptr[9] << 8) + (ptr[8] << 0)); state.cur_location.lon.udeg = (int)((ptr[11] << 24) + (ptr[10] << 16) + (ptr[9] << 8) + (ptr[8] << 0));
state.cur_dive->dive_site_uuid = create_dive_site_with_gps("DLF imported", &state.cur_location, state.cur_dive->when); state.cur_dive->dive_site_uuid = create_dive_site_with_gps("DLF imported", &state.cur_location, state.cur_dive->when)->uuid;
break; break;
default: default:
break; break;

6
core/parse.c
View file

@ -435,8 +435,8 @@ void add_dive_site(char *ds_name, struct dive *dive, struct parser_state *state)
if (exact_match) { if (exact_match) {
dive->dive_site_uuid = exact_match->uuid; dive->dive_site_uuid = exact_match->uuid;
} else { } else {
dive->dive_site_uuid = create_dive_site(buffer, dive->when); struct dive_site *newds = create_dive_site(buffer, dive->when);
struct dive_site *newds = get_dive_site_by_uuid(dive->dive_site_uuid); dive->dive_site_uuid = newds->uuid;
if (has_location(&state->cur_location)) { if (has_location(&state->cur_location)) {
// we started this uuid with GPS data, so lets use those // we started this uuid with GPS data, so lets use those
newds->location = state->cur_location; newds->location = state->cur_location;
@ -450,7 +450,7 @@ void add_dive_site(char *ds_name, struct dive *dive, struct parser_state *state)
dive->dive_site_uuid = ds->uuid; dive->dive_site_uuid = ds->uuid;
} }
} else { } else {
dive->dive_site_uuid = create_dive_site(buffer, dive->when); dive->dive_site_uuid = create_dive_site(buffer, dive->when)->uuid;
} }
} }
free(to_free); free(to_free);

2
core/uemis-downloader.c
View file

@ -992,7 +992,7 @@ static bool process_raw_buffer(device_data_t *devdata, uint32_t deviceid, char *
} else if (!is_log && dive && !strcmp(tag, "divespot_id")) { } else if (!is_log && dive && !strcmp(tag, "divespot_id")) {
int divespot_id = atoi(val); int divespot_id = atoi(val);
if (divespot_id != -1) { if (divespot_id != -1) {
dive->dive_site_uuid = create_dive_site("from Uemis", dive->when); dive->dive_site_uuid = create_dive_site("from Uemis", dive->when)->uuid;
uemis_mark_divelocation(dive->dc.diveid, divespot_id, dive->dive_site_uuid); uemis_mark_divelocation(dive->dc.diveid, divespot_id, dive->dive_site_uuid);
} }
#if UEMIS_DEBUG & 2 #if UEMIS_DEBUG & 2

2
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -688,7 +688,7 @@ uint32_t MainTab::updateDiveSite(uint32_t pickedUuid, dive *d)
if (pickedUuid == RECENTLY_ADDED_DIVESITE) { if (pickedUuid == RECENTLY_ADDED_DIVESITE) {
QString name = ui.location->text().isEmpty() ? tr("New dive site") : ui.location->text(); QString name = ui.location->text().isEmpty() ? tr("New dive site") : ui.location->text();
pickedUuid = create_dive_site(qPrintable(name), displayed_dive.when); pickedUuid = create_dive_site(qPrintable(name), displayed_dive.when)->uuid;
createdNewDive = true; createdNewDive = true;
LocationFilterModel::instance()->addName(name); LocationFilterModel::instance()->addName(name);
} }

5
mobile-widgets/qmlmanager.cpp
View file

@ -760,7 +760,7 @@ static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, doub
if (ds) { if (ds) {
ds->location = location; ds->location = location;
} else { } else {
d->dive_site_uuid = create_dive_site_with_gps(locationtext, &location, d->when); d->dive_site_uuid = create_dive_site_with_gps(locationtext, &location, d->when)->uuid;
} }
} }
@ -879,8 +879,7 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString
if (!ds) if (!ds)
ds = get_dive_site_by_name(qPrintable(location)); ds = get_dive_site_by_name(qPrintable(location));
if (!ds && !location.isEmpty()) { if (!ds && !location.isEmpty()) {
uint32_t uuid = create_dive_site(qPrintable(location), d->when); ds = create_dive_site(qPrintable(location), d->when);
ds = get_dive_site_by_uuid(uuid);
} }
d->dive_site_uuid = ds ? ds->uuid : 0; d->dive_site_uuid = ds ? ds->uuid : 0;
} }

4
smtk-import/smartrak.c
View file

@ -376,9 +376,9 @@ static void smtk_build_location(MdbHandle *mdb, char *idx, timestamp_t when, uin
ds = get_dive_site_by_name(str); ds = get_dive_site_by_name(str);
if (!ds) { if (!ds) {
if (!has_location(&loc)) if (!has_location(&loc))
*location = create_dive_site(str, when); *location = create_dive_site(str, when)->uuid;
else else
*location = create_dive_site_with_gps(str, &loc, when); *location = create_dive_site_with_gps(str, &loc, when)->uuid;
ds = get_dive_site_by_uuid(*location); ds = get_dive_site_by_uuid(*location);
} else { } else {
*location = ds->uuid; *location = ds->uuid;