X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=statistics.c;h=9510030d717655e06b1104474814429e2af3ef07;hb=eac816b9d8a199375cf023a956c0959ccf3bc87b;hp=4c637944329f8e3bea52257909c6f7f666acca16;hpb=d03a92728fb625a388ce4eb4d8e885c6fc40d55a;p=ext%2Fsubsurface.git

diff --git a/statistics.c b/statistics.c
index 4c63794..9510030 100644
--- 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;