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

Improve helper functions

Browse source 
Sometimes we want to create a dive site just based on a name, sometimes we
have both a name and GPS coordinates. Let's make a helper for either case.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-12 01:59:16 -08:00
parent ccf833b45c
commit cd28e88bee
3 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
divesite.c
View file

@ -37,7 +37,17 @@ struct dive_site *alloc_dive_site()
}
/* allocate a new site and add it to the table */
uint32_t create_dive_site(const char *name, degrees_t latitude, degrees_t longitude)
uint32_t create_dive_site(const char *name)
{
struct dive_site *ds = alloc_dive_site();
ds->uuid = dive_site_getUniqId();
ds->name = copy_string(name);
return ds->uuid;
}
/* same as before, but with GPS data */
uint32_t create_dive_site_with_gps(const char *name, degrees_t latitude, degrees_t longitude)
{
struct dive_site *ds = alloc_dive_site();
ds->uuid = dive_site_getUniqId();
@ -53,7 +63,7 @@ uint32_t dive_site_uuid_by_name(const char *name)
{
uint32_t id = get_dive_site_uuid_by_name(name);
if (id == 0)
id = create_dive_site(name, (degrees_t){0}, (degrees_t){0});
id = create_dive_site(name);
return id;
}

10
divesite.h
View file

@ -4,6 +4,10 @@
#include "units.h"
#include <stdlib.h>
#ifdef __cplusplus
extern "C" {
#endif
struct dive_site
{
uint32_t uuid;
@ -53,7 +57,11 @@ static inline uint32_t get_dive_site_uuid_by_name(const char *name)
}
struct dive_site *alloc_dive_site();
uint32_t create_dive_site(const char *name, degrees_t latitude, degrees_t longitude);
uint32_t create_dive_site(const char *name);
uint32_t create_dive_site_with_gps(const char *name, degrees_t latitude, degrees_t longitude);
uint32_t dive_site_uuid_by_name(const char *name);
#ifdef __cplusplus
}
#endif
#endif // DIVESITE_H

10
parse-xml.c
View file

@ -983,7 +983,7 @@ static void divinglog_place(char *place, uint32_t *uuid)
country ? country : "");
*uuid = get_dive_site_uuid_by_name(buffer);
if (*uuid == 0)
*uuid = create_dive_site(buffer, (degrees_t){0}, (degrees_t){0});
*uuid = create_dive_site(buffer);
city = NULL;
country = NULL;
@ -1156,7 +1156,7 @@ static void gps_in_dive(char *buffer, struct dive *dive)
uint32_t uuid = dive->dive_site_uuid;
if (uuid == 0) {
fprintf(stderr, "found no uuid in dive, creating a divesite without name and above GPS\n");
dive->dive_site_uuid = create_dive_site("", latitude, longitude);
dive->dive_site_uuid = create_dive_site_with_gps("", latitude, longitude);
} else {
fprintf(stderr, "found uuid in dive, checking to see if we should add GPS\n");
struct dive_site *ds = get_dive_site_by_uuid(uuid);
@ -1193,7 +1193,7 @@ static void add_dive_site(char *buffer, struct dive *dive)
exit(1);
}
} else {
dive->dive_site_uuid = create_dive_site(buffer, (degrees_t){0}, (degrees_t){0});
dive->dive_site_uuid = create_dive_site(buffer);
}
}
}
@ -1437,7 +1437,7 @@ static void dive_site_end(void)
if (!cur_dive_site)
return;
if (cur_dive_site->uuid) {
uint32_t tmp = create_dive_site(cur_dive_site->name, cur_dive_site->latitude, cur_dive_site->longitude);
uint32_t tmp = create_dive_site_with_gps(cur_dive_site->name, cur_dive_site->latitude, cur_dive_site->longitude);
struct dive_site *ds = get_dive_site_by_uuid(tmp);
ds->uuid = cur_dive_site->uuid;
ds->notes = cur_dive_site->notes;
@ -2502,7 +2502,7 @@ extern int cobalt_location(void *handle, int columns, char **data, char **column
sprintf(tmp, "%s / %s", location, data[0]);
free(location);
location = NULL;
cur_dive->dive_site_uuid = create_dive_site(tmp, (degrees_t){0}, (degrees_t){0});
cur_dive->dive_site_uuid = create_dive_site(tmp);
} else {
location = strdup(data[0]);
}