From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Nov 2011 23:42:37 +0000 (-0200)
Subject: Save cylinder O2/He content after the cylinder type description
X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=5c2fca262043992783551eceebc81c1f589b185b

Save cylinder O2/He content after the cylinder type description

This changes the save format xml to be a bit more readable: instead of
putting the gasmix first, put the cylinder type (size, workpressure and
description) first, then gasmix, then pressure details.

It makes no difference for machine parsing, but I think it's a lot more
logical for humans that actually look at the xml file.  And we really do
want to make the xml file readable by humans.

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

diff --git a/save-xml.c b/save-xml.c
index 4183b1c..d6c2497 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -202,16 +202,16 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 		if (!o2 && !volume && !start && !end)
 			return;
 		fprintf(f, "  <cylinder");
-		if (o2) {
-			fprintf(f, " o2='%u.%u%%'", FRACTION(o2, 10));
-			if (he)
-				fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
-		}
 		if (volume)
 			show_milli(f, " size='", volume, " l", "'");
 		show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'");
 		if (description && *description)
 			fprintf(f, " description='%s'", description);
+		if (o2) {
+			fprintf(f, " o2='%u.%u%%'", FRACTION(o2, 10));
+			if (he)
+				fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
+		}
 		show_pressure(f, cylinder->start, " start='", "'");
 		show_pressure(f, cylinder->end, " end='", "'");
 		fprintf(f, " />\n");