mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

smtk-import reuse pre-existent code and fix leak

Browse source 
Use update_event_name() for bookmarks merge and free temp string.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2017-04-12 21:54:47 +02:00 committed by Dirk Hohndel
parent 329a6bc075
commit 75007aa4ef
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
smtk-import/smartrak.c
View file

@ -687,15 +687,15 @@ static void smtk_parse_bookmarks(MdbHandle *mdb, struct dive *d, char *dive_idx)
time = lrint(strtod(col[4]->bind_ptr, NULL) * 60); time = lrint(strtod(col[4]->bind_ptr, NULL) * 60);
tmp = strdup(col[2]->bind_ptr); tmp = strdup(col[2]->bind_ptr);
ev = find_bookmark(d->dc.events, time); ev = find_bookmark(d->dc.events, time);
if (ev != NULL) { if (ev)
memset(&ev->name, 0, strlen(tmp) + 1); update_event_name(d, ev, tmp);
memcpy(ev->name, tmp, strlen(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",
d->number, tmp); d->number, tmp);
} }
} }
free(tmp);
smtk_free(bound_values, table->num_cols); smtk_free(bound_values, table->num_cols);
mdb_free_tabledef(table); mdb_free_tabledef(table);
} }