summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tcanabrava@kde.org>2017-10-02 17:24:26 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-10-02 09:52:39 -0700
commitf9a36132adbcb587f4810337700cf9a88044d337 (patch)
tree45d38be6f0720853d45d199cbf31bba14ee5ac46 /core
parent32e6ca49192a010b2c18d27a5eb5e9214bd4c098 (diff)
downloadsubsurface-f9a36132adbcb587f4810337700cf9a88044d337.tar.gz
[Divesite] Load / Save divesite country on git
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
-rw-r--r--core/load-git.c5
-rw-r--r--core/save-git.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/core/load-git.c b/core/load-git.c
index e7732a69f..c77d4c05d 100644
--- a/core/load-git.c
+++ b/core/load-git.c
@@ -293,6 +293,9 @@ static void parse_dive_notrip(char *line, struct membuffer *str, void *_dive)
struct dive *dive = _dive; dive->tripflag = NO_TRIP;
}
+static void parse_site_country(char *line, struct membuffer *str, void *_ds)
+{ (void) line; struct dive_site *ds = _ds; ds->country = strdup(mb_cstring(str)); }
+
static void parse_site_description(char *line, struct membuffer *str, void *_ds)
{ (void) line; struct dive_site *ds = _ds; ds->description = strdup(mb_cstring(str)); }
@@ -994,7 +997,7 @@ static void dive_parser(char *line, struct membuffer *str, void *_dive)
struct keyword_action site_action[] = {
#undef D
#define D(x) { #x, parse_site_ ## x }
- D(description), D(geo), D(gps), D(name), D(notes)
+ D(country), D(description), D(geo), D(gps), D(name), D(notes)
};
static void site_parser(char *line, struct membuffer *str, void *_ds)
diff --git a/core/save-git.c b/core/save-git.c
index 548664239..be0d3920b 100644
--- a/core/save-git.c
+++ b/core/save-git.c
@@ -961,6 +961,7 @@ static void save_divesites(git_repository *repo, struct dir *tree)
}
struct membuffer site_file_name = { 0 };
put_format(&site_file_name, "Site-%08x", ds->uuid);
+ show_utf8(&b, "country ", ds->country, "\n");
show_utf8(&b, "name ", ds->name, "\n");
show_utf8(&b, "description ", ds->description, "\n");
show_utf8(&b, "notes ", ds->notes, "\n");