X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=64d65471132d3340756e1ff274c9ed807fe848c1;hb=85921592b052e2be867f049306abd28e69c978ae;hp=309f7cc08c452c28283e415b7028aee759e38531;hpb=b176daf6d6d169bfa9b811687bd7696b1bb6063f;p=ext%2Fsubsurface.git

diff --git a/save-xml.c b/save-xml.c
index 309f7cc..64d6547 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -127,7 +127,7 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 	for (i = 0; i < MAX_CYLINDERS; i++) {
 		cylinder_t *cylinder = dive->cylinder+i;
 		int volume = cylinder->type.size.mliter;
-		int pressure = cylinder->type.workingpressure.mbar;
+		const char *description = cylinder->type.description;
 		int o2 = cylinder->gasmix.o2.permille;
 		int he = cylinder->gasmix.he.permille;
 
@@ -136,17 +136,14 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 			return;
 		fprintf(f, "  <cylinder");
 		if (o2) {
-			int n2 = 1000 - o2 - he;
 			fprintf(f, " o2='%u.%u%%'", FRACTION(o2, 10));
 			if (he)
 				fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
-			fprintf(f, " n2='%u.%u%%'", FRACTION(n2, 10));
 		}
-		if (volume) {
+		if (volume)
 			fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
-			if (pressure)
-				fprintf(f, " workpressure='%u.%03u bar'", FRACTION(pressure, 1000));
-		}
+		if (description)
+			fprintf(f, " description='%s'", description);
 		fprintf(f, " />\n");
 	}
 }
@@ -195,4 +192,5 @@ void save_dives(const char *filename)
 	for (i = 0; i < dive_table.nr; i++)
 		save_dive(f, get_dive(i));
 	fprintf(f, "</dives>\n");
+	fclose(f);
 }