Correctly free the GSList in file_open

[ext/subsurface.git] / statistics.c

diff --git a/statistics.c b/statistics.c
index 4c637944329f8e3bea52257909c6f7f666acca16..9510030d717655e06b1104474814429e2af3ef07 100644 (file)
--- a/statistics.c
+++ b/statistics.c
@@ -169,12 +169,9 @@ void show_dive_stats(struct dive *dive)
 
                start = cyl->start.mbar ? : cyl->sample_start.mbar;
                end = cyl->end.mbar ? : cyl->sample_end.mbar;
-               /* we assume that every valid cylinder has either a working pressure
-                * or a size; but for good measure let's also accept cylinders with
-                * a starting or ending pressure*/
-               if (cyl->type.workingpressure.mbar || cyl->type.size.mliter || start || end) {
+               if (!cylinder_none(cyl)) {
                        /* 0% O2 strangely means air, so 21% - I don't like that at all */
-                       int o2 = cyl->gasmix.o2.permille ? : 209;
+                       int o2 = cyl->gasmix.o2.permille ? : AIR_PERMILLE;
                        if (offset > 0) {
                                snprintf(buf+offset, 80-offset, ", ");
                                offset += 2;