From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Sep 2011 22:07:47 +0000 (-0700)
Subject: Properly save/restore cylinder description string
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=85921592b052e2be867f049306abd28e69c978ae;p=ext%2Fsubsurface.git

Properly save/restore cylinder description string

We saved it under the wrong name, and didn't restore it at all. Fix.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/parse-xml.c b/parse-xml.c
index 75959d6..b123bb3 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -658,6 +658,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 		return;
 	if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cylinder_index].type.workingpressure))
 		return;
+	if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cylinder_index].type.description))
+		return;
 
 	if (MATCH(".o2", gasmix, &dive->cylinder[cylinder_index].gasmix.o2))
 		return;
diff --git a/save-xml.c b/save-xml.c
index 46bcec0..64d6547 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -143,7 +143,7 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 		if (volume)
 			fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
 		if (description)
-			fprintf(f, " name='%s'", description);
+			fprintf(f, " description='%s'", description);
 		fprintf(f, " />\n");
 	}
 }