diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-11 11:36:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-11 15:49:17 -0700 |
| commit | 1cc62d581158d52252f2ad7ef076811129510141 (patch) | |
| tree | c549323d6d24783ae8f3ba4f7cd7fc3b868a24db /parse-xml.c | |
| parent | 9580109406f79698b570e917c21b8844f9de34b5 (diff) | |
| download | subsurface-1cc62d581158d52252f2ad7ef076811129510141.tar.gz | |
Fix up dive number naming
Use "dive->number" instead of "dive->nr". And make the XML match too.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/parse-xml.c b/parse-xml.c index a71ff235b..b5f86fa80 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -609,8 +609,7 @@ static void divinglog_place(char *place, void *_location) static int divinglog_dive_match(struct dive *dive, const char *name, int len, char *buf) { - return MATCH(".id", get_index, &dive->nr) || - MATCH(".divedate", divedate, &dive->when) || + return MATCH(".divedate", divedate, &dive->when) || MATCH(".entrytime", divetime, &dive->when) || MATCH(".depth", depth, &dive->maxdepth) || MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) || @@ -877,7 +876,7 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf) break; } - if (MATCH(".nr", get_index, &dive->nr)) + if (MATCH(".number", get_index, &dive->number)) return; if (MATCH(".date", divedate, &dive->when)) return; |