Miika fixed the statistics code that didn't properly check for the "no
cylinder info" case - this cleans it up and just uses the helper
function in equipment.c.
Rename the helper to be slightly better named while at it.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
pressure_t start, end, sample_start, sample_end;
} cylinder_t;
pressure_t start, end, sample_start, sample_end;
} cylinder_t;
+extern int cylinder_none(cylinder_t *cyl);
+
extern int get_pressure_units(unsigned int mb, const char **units);
extern double get_depth_units(unsigned int mm, int *frac, const char **units);
extern double get_volume_units(unsigned int mm, int *frac, const char **units);
extern int get_pressure_units(unsigned int mb, const char **units);
extern double get_depth_units(unsigned int mm, int *frac, const char **units);
extern double get_volume_units(unsigned int mm, int *frac, const char **units);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
}
gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
}
-static int cyl_nothing(cylinder_t *cyl)
+int cylinder_none(cylinder_t *cyl)
{
return !cyl->type.size.mliter &&
!cyl->type.workingpressure.mbar &&
{
return !cyl->type.size.mliter &&
!cyl->type.workingpressure.mbar &&
do {
cylinder_t *cyl = &dive->cylinder[max-1];
do {
cylinder_t *cyl = &dive->cylinder[max-1];
+ if (!cylinder_none(cyl))
start = cyl->start.mbar ? : cyl->sample_start.mbar;
end = cyl->end.mbar ? : cyl->sample_end.mbar;
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 || cyl->gasmix.o2.permille || 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;
if (offset > 0) {
/* 0% O2 strangely means air, so 21% - I don't like that at all */
int o2 = cyl->gasmix.o2.permille ? : 209;
if (offset > 0) {