From d463cace5ee1ac38928921ea4d47b6e38ce29c45 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 22 Sep 2011 16:45:28 -0700 Subject: [PATCH] Clean up event handling from libdivecomputer This just moves the event handling out into its own helper function. Signed-off-by: Linus Torvalds --- libdivecomputer.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libdivecomputer.c b/libdivecomputer.c index f645bff..d405253 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -118,16 +118,24 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases) return PARSER_STATUS_SUCCESS; } -void -sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata) +static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value) { - int i; static const char *events[] = { "none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter", "violation", "bookmark", "surface", "safety stop", "gaschange", "safety stop (voluntary)", "safety stop (mandatory)", "deepstop", "ceiling (safety stop)", "unknown", "divetime", "maxdepth", "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"}; + + printf(" %s\n", + value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]); +} + + +void +sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata) +{ + int i; struct dive **divep = userdata; struct dive *dive = *divep; struct sample *sample; @@ -155,8 +163,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5; break; case SAMPLE_TYPE_EVENT: - printf(" %s\n", - value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]); + handle_event(divep, sample, value); break; case SAMPLE_TYPE_RBT: printf(" %u\n", value.rbt); -- 2.43.0