mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up event handling from libdivecomputer

Browse source 
This just moves the event handling out into its own helper function.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-22 16:45:28 -07:00
parent c0adfdc41b
commit d463cace5e
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libdivecomputer.c
View file

@ -118,16 +118,24 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
return PARSER_STATUS_SUCCESS; return PARSER_STATUS_SUCCESS;
} }
void static void handle_event(struct dive **divep, struct sample *sample, parser_sample_value_t value)
sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
{ {
int i;
static const char *events[] = { static const char *events[] = {
"none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter", "none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter",
"violation", "bookmark", "surface", "safety stop", "gaschange", "violation", "bookmark", "surface", "safety stop", "gaschange",
"safety stop (voluntary)", "safety stop (mandatory)", "deepstop", "safety stop (voluntary)", "safety stop (mandatory)", "deepstop",
"ceiling (safety stop)", "unknown", "divetime", "maxdepth", "ceiling (safety stop)", "unknown", "divetime", "maxdepth",
"OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"}; "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"};
printf(" <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\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 **divep = userdata;
struct dive *dive = *divep; struct dive *dive = *divep;
struct sample *sample; 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; sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5;
break; break;
case SAMPLE_TYPE_EVENT: case SAMPLE_TYPE_EVENT:
printf(" <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\n", handle_event(divep, sample, value);
value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]);
break; break;
case SAMPLE_TYPE_RBT: case SAMPLE_TYPE_RBT:
printf(" <rbt>%u</rbt>\n", value.rbt); printf(" <rbt>%u</rbt>\n", value.rbt);