diff options
author | Nathan Samson <nathansamson@gmail.com> | 2011-09-04 22:15:55 +0200 |
---|---|---|
committer | Nathan Samson <nathansamson@gmail.com> | 2011-09-04 22:15:55 +0200 |
commit | 6b075e0339f419555f08ece3a6c4a29407ecc32b (patch) | |
tree | c8c9df6d8690edddec8da8f8f3a87123f86dead0 /save-xml.c | |
parent | c4514b062a9866153c179d4b6ecf7972c9496891 (diff) | |
parent | aab4d593bdbffef8442282318778a9833cbc7a43 (diff) | |
download | subsurface-6b075e0339f419555f08ece3a6c4a29407ecc32b.tar.gz |
Merge hbonse's UI tweaks, but fixing the compile warnings. Also bringing it up to date with the master (and my own UI improvements)
Signed-off-by: Nathan Samson <nathansamson@gmail.com>
Diffstat (limited to 'save-xml.c')
-rw-r--r-- | save-xml.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/save-xml.c b/save-xml.c index 9e3640cad..c33cbb0dd 100644 --- a/save-xml.c +++ b/save-xml.c @@ -127,7 +127,6 @@ 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; int o2 = cylinder->gasmix.o2.permille; int he = cylinder->gasmix.he.permille; @@ -140,11 +139,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive) if (he) fprintf(f, " he='%u.%u%%'", FRACTION(he, 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)); - } fprintf(f, " />\n"); } } @@ -193,4 +189,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); } |