diff options
author | Maximilian Güntner <maximilian.guentner@gmail.com> | 2012-08-22 01:15:41 +0200 |
---|---|---|
committer | Maximilian Güntner <maximilian.guentner@gmail.com> | 2012-08-22 01:15:41 +0200 |
commit | 0c0ec7e4f60d9678c3950757ccb8f791f10d033c (patch) | |
tree | c0bc02a006629b9aff242a5ffe08e0d0a16e20b2 /parse-xml.c | |
parent | 2cada118eb515e369ba23b85c8f3fb8c4d100aaa (diff) | |
parent | 666538ec7739fe839623bd1b6f9f80ff884ad5a9 (diff) | |
download | subsurface-0c0ec7e4f60d9678c3950757ccb8f791f10d033c.tar.gz |
Merge branch 'master' into freediving-tweaks
Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
Diffstat (limited to 'parse-xml.c')
-rw-r--r-- | parse-xml.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/parse-xml.c b/parse-xml.c index 761cc3b41..173314dd4 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -647,6 +647,7 @@ static int uddf_fill_sample(struct sample *sample, const char *name, int len, ch return MATCH(".divetime", sampletime, &sample->time) || MATCH(".depth", depth, &sample->depth) || MATCH(".temperature", temperature, &sample->temperature) || + MATCH(".tankpressure", pressure, &sample->cylinderpressure) || 0; } @@ -1099,6 +1100,10 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf) return; if (MATCH(".location", utf8_string, &dive->location)) return; + if (MATCH(".suit", utf8_string, &dive->suit)) + return; + if (MATCH(".divesuit", utf8_string, &dive->suit)) + return; if (MATCH(".notes", utf8_string, &dive->notes)) return; if (MATCH(".divemaster", utf8_string, &dive->divemaster)) |