diff options
Diffstat (limited to 'core/parse-xml.c')
| -rw-r--r-- | core/parse-xml.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index ae779e1f8..1f31d69d7 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -652,7 +652,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second if (idx < 0 || idx >= MAX_CYLINDERS) return; /* The gas switch event format is insane for historical reasons */ - struct gasmix *mix = &dive->cylinder[idx].gasmix; + struct gasmix mix = dive->cylinder[idx].gasmix; int o2 = get_o2(mix); int he = get_he(mix); struct event *ev; @@ -665,7 +665,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second ev = add_event(dc, seconds, he ? SAMPLE_EVENT_GASCHANGE2 : SAMPLE_EVENT_GASCHANGE, 0, value, "gaschange"); if (ev) { ev->gas.index = idx; - ev->gas.mix = *mix; + ev->gas.mix = mix; } } @@ -1654,7 +1654,7 @@ static timestamp_t parse_dlf_timestamp(unsigned char *buffer) return offset + 946684800; } -int parse_dlf_buffer(unsigned char *buffer, size_t size) +int parse_dlf_buffer(unsigned char *buffer, size_t size, struct dive_table *table) { unsigned char *ptr = buffer; unsigned char event; @@ -1663,7 +1663,7 @@ int parse_dlf_buffer(unsigned char *buffer, size_t size) int i; char serial[6]; - target_table = &dive_table; + target_table = table; // Check for the correct file magic if (ptr[0] != 'D' || ptr[1] != 'i' || ptr[2] != 'v' || ptr[3] != 'E') |