Properly save/restore cylinder description string

[ext/subsurface.git] / save-xml.c

diff --git a/save-xml.c b/save-xml.c
index 9e3640cad84d9cf99e92eabf6d6c1e5369d896d2..64d65471132d3340756e1ff274c9ed807fe848c1 100644 (file)
--- 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;
 
@@ -140,11 +140,10 @@ 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));
-               }
+               if (description)
+                       fprintf(f, " description='%s'", description);
                fprintf(f, " />\n");
        }
 }
@@ -193,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);
 }