mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-02 23:20:20 +00:00
core: pass dc-number to update_event_name()
The dive was passed as an argument to update_event_name(), but the divecomputer was derived from the global dc_number variable. That makes no sense. Therefore, pass the dc_number as argument and update the only caller (smtk-import). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
0c4be83b31
commit
12406786f1
3 changed files with 3 additions and 3 deletions
|
@ -123,7 +123,7 @@ void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int second
|
||||||
* have to actually remove the existing event and replace it with a new one.
|
* have to actually remove the existing event and replace it with a new one.
|
||||||
* WARNING, WARNING... this may end up freeing event in case that event is indeed
|
* WARNING, WARNING... this may end up freeing event in case that event is indeed
|
||||||
* WARNING, WARNING... part of this divecomputer on this dive! */
|
* WARNING, WARNING... part of this divecomputer on this dive! */
|
||||||
void update_event_name(struct dive *d, struct event *event, const char *name)
|
void update_event_name(struct dive *d, int dc_number, struct event *event, const char *name)
|
||||||
{
|
{
|
||||||
if (!d || !event)
|
if (!d || !event)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -193,7 +193,7 @@ extern bool is_cylinder_used(const struct dive *dive, int idx);
|
||||||
extern bool is_cylinder_prot(const struct dive *dive, int idx);
|
extern bool is_cylinder_prot(const struct dive *dive, int idx);
|
||||||
extern void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int time, int idx);
|
extern void add_gas_switch_event(struct dive *dive, struct divecomputer *dc, int time, int idx);
|
||||||
extern struct event *create_gas_switch_event(struct dive *dive, struct divecomputer *dc, int seconds, int idx);
|
extern struct event *create_gas_switch_event(struct dive *dive, struct divecomputer *dc, int seconds, int idx);
|
||||||
extern void update_event_name(struct dive *d, struct event *event, const char *name);
|
extern void update_event_name(struct dive *d, int dc_number, struct event *event, const char *name);
|
||||||
extern void per_cylinder_mean_depth(const struct dive *dive, struct divecomputer *dc, int *mean, int *duration);
|
extern void per_cylinder_mean_depth(const struct dive *dive, struct divecomputer *dc, int *mean, int *duration);
|
||||||
extern int get_cylinder_index(const struct dive *dive, const struct event *ev);
|
extern int get_cylinder_index(const struct dive *dive, const struct event *ev);
|
||||||
extern struct gasmix get_gasmix_from_event(const struct dive *, const struct event *ev);
|
extern struct gasmix get_gasmix_from_event(const struct dive *, const struct event *ev);
|
||||||
|
|
|
@ -806,7 +806,7 @@ static void smtk_parse_bookmarks(MdbHandle *mdb, struct dive *d, char *dive_idx)
|
||||||
tmp = strdup(bound_values[2]);
|
tmp = strdup(bound_values[2]);
|
||||||
ev = find_bookmark(d->dc.events, time);
|
ev = find_bookmark(d->dc.events, time);
|
||||||
if (ev)
|
if (ev)
|
||||||
update_event_name(d, ev, tmp);
|
update_event_name(d, 0, ev, tmp);
|
||||||
else
|
else
|
||||||
if (!add_event(&d->dc, time, SAMPLE_EVENT_BOOKMARK, 0, 0, tmp))
|
if (!add_event(&d->dc, time, SAMPLE_EVENT_BOOKMARK, 0, 0, tmp))
|
||||||
report_error("[smtk-import] Error - Couldn't add bookmark, dive %d, Name = %s",
|
report_error("[smtk-import] Error - Couldn't add bookmark, dive %d, Name = %s",
|
||||||
|
|
Loading…
Reference in a new issue