diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-20 21:07:36 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-14 10:22:41 -0700 |
| commit | c840ab43323f351043e7f74502f933ae46d3ea9e (patch) | |
| tree | faf08b80c67a9146d89ad41f7579a3788a64e8b7 /core/parse-xml.c | |
| parent | 777cbd9cfe7cd026315bfcbac15126512a016a90 (diff) | |
| download | subsurface-c840ab43323f351043e7f74502f933ae46d3ea9e.tar.gz | |
Fill in divecomputer serial number and firmware version on loading
We have the serial number and firmware version fields in "struct
divecomputer", but we don't actually fill them in when loading the data
from git or xml, because we save all that information in the separate
device table instead.
But in order to always have the serial number associated with a device,
let's make sure to fill those fields in. It won't hurt, and this way we
have the information available whether we just loaded the dive from a
file, or imported it from the dive computer. One less semantic
difference to worry about.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/parse-xml.c')
| -rw-r--r-- | core/parse-xml.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index 3b5a2d794..052cb124c 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -892,6 +892,8 @@ static int match_dc_data_fields(struct divecomputer *dc, const char *name, char /* We're in the top-level dive xml. Try to convert whatever value to a dive value */ static void try_to_fill_dc(struct divecomputer *dc, const char *name, char *buf) { + unsigned int deviceid; + start_match("divecomputer", name, buf); if (MATCH("date", divedate, &dc->when)) @@ -900,8 +902,10 @@ static void try_to_fill_dc(struct divecomputer *dc, const char *name, char *buf) return; if (MATCH("model", utf8_string, &dc->model)) return; - if (MATCH("deviceid", hex_value, &dc->deviceid)) + if (MATCH("deviceid", hex_value, &deviceid)) { + set_dc_deviceid(dc, deviceid); return; + } if (MATCH("diveid", hex_value, &dc->diveid)) return; if (MATCH("dctype", get_dc_type, &dc->divemode)) |