Change calling convention of 'edit_cylinder_info'

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

diff --git a/parse-xml.c b/parse-xml.c
index e6472735dcdd40ca91bf69daebcb035ac7ed9be7..efae6b61fd196e893cacc46df8fcffc280f21fd9 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -587,6 +587,8 @@ static void try_to_fill_event(const char *name, char *buf)
                return;
        if (MATCH(".flags", get_index, &event.flags))
                return;
+       if (MATCH(".value", get_index, &event.value))
+               return;
        nonmatch("event", name, buf);
 }
 
@@ -1083,7 +1085,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
                return;
 
        cuft = type->size.mliter / 28317.0;
-       cuft *= type->workingpressure.mbar / 1013.25;
+       cuft *= to_ATM(type->workingpressure);
        psi = type->workingpressure.mbar / 68.95;
 
        switch (psi) {
@@ -1138,7 +1140,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
 
        if (input_units.volume == CUFT || import_source == SUUNTO) {
                volume_of_air = type->size.mliter * 28.317;     /* milli-cu ft to milliliter */
-               atm = type->workingpressure.mbar / 1013.25;     /* working pressure in atm */
+               atm = to_ATM(type->workingpressure);            /* working pressure in atm */
                volume = volume_of_air / atm;                   /* milliliters at 1 atm: "true size" */
                type->size.mliter = volume + 0.5;
        }
@@ -1175,7 +1177,7 @@ static void event_start(void)
 
 static void event_end(void)
 {
-       if (event.name)
+       if (event.name && strcmp(event.name, "surface") != 0)
                add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name);
        event.active = 0;
 }