mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up dive number naming

Browse source 
Use "dive->number" instead of "dive->nr". And make the XML match too.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-11 11:36:33 -07:00
parent 9580109406
commit 1cc62d5811
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dive.h
View file

@ -128,7 +128,7 @@ struct sample {
#define MAX_CYLINDERS (8)
struct dive {
int nr;
int number;
time_t when;
char *location;
char *notes;

4
info.c
View file

@ -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);

5
parse-xml.c
View file

@ -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;

4
save-xml.c
View file

@ -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'",