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 | |
| 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>
| -rw-r--r-- | dive.h | 2 | ||||
| -rw-r--r-- | info.c | 4 | ||||
| -rw-r--r-- | parse-xml.c | 5 | ||||
| -rw-r--r-- | save-xml.c | 4 |
4 files changed, 7 insertions, 8 deletions
@@ -128,7 +128,7 @@ struct sample { #define MAX_CYLINDERS (8) struct dive { - int nr; + int number; time_t when; char *location; char *notes; @@ -118,8 +118,8 @@ void show_dive_info(struct dive *dive) gtk_entry_set_text(location, text); len = 0; - if (dive->nr) - len = snprintf(buffer, sizeof(buffer), "%d. ", dive->nr); + if (dive->number) + len = snprintf(buffer, sizeof(buffer), "%d. ", dive->number); snprintf(buffer+len, sizeof(buffer)-len, "%s", text); gtk_label_set_text(GTK_LABEL(locationnote), buffer); 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; diff --git a/save-xml.c b/save-xml.c index e47092ebc..3ed67fe39 100644 --- a/save-xml.c +++ b/save-xml.c @@ -206,8 +206,8 @@ static void save_dive(FILE *f, struct dive *dive) struct tm *tm = gmtime(&dive->when); fputs("<dive", f); - if (dive->nr) - fprintf(f, " nr='%d'", dive->nr); + if (dive->number) + fprintf(f, " number='%d'", dive->number); fprintf(f, " date='%04u-%02u-%02u'", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday); fprintf(f, " time='%02u:%02u:%02u'", |