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

Core: export free_picture()

Browse source 
Export the free_picture() function from dive.c. The parser may need
this in case of truncated files to free its temporary resources.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-21 19:52:37 +02:00 • committed by Dirk Hohndel
parent 45f4dac70a
commit 46bf8bf2fa
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/dive.c
View file

@ -500,7 +500,6 @@ struct dive *alloc_dive(void)
static void free_dc(struct divecomputer *dc); static void free_dc(struct divecomputer *dc);
static void free_dc_contents(struct divecomputer *dc); static void free_dc_contents(struct divecomputer *dc);
static void free_pic(struct picture *picture);
/* copy an element in a list of dive computer extra data */ /* copy an element in a list of dive computer extra data */
static void copy_extra_data(struct extra_data *sed, struct extra_data *ded) static void copy_extra_data(struct extra_data *sed, struct extra_data *ded)
@ -569,7 +568,7 @@ static void free_dive_structures(struct dive *d)
taglist_free(d->tag_list); taglist_free(d->tag_list);
free_dc_contents(&d->dc); free_dc_contents(&d->dc);
STRUCTURED_LIST_FREE(struct divecomputer, d->dc.next, free_dc); STRUCTURED_LIST_FREE(struct divecomputer, d->dc.next, free_dc);
STRUCTURED_LIST_FREE(struct picture, d->picture_list, free_pic); STRUCTURED_LIST_FREE(struct picture, d->picture_list, free_picture);
for (int i = 0; i < MAX_CYLINDERS; i++) for (int i = 0; i < MAX_CYLINDERS; i++)
free((void *)d->cylinder[i].type.description); free((void *)d->cylinder[i].type.description);
for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++) for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++)
@ -2990,7 +2989,7 @@ static void free_dc(struct divecomputer *dc)
free(dc); free(dc);
} }
static void free_pic(struct picture *picture) void free_picture(struct picture *picture)
{ {
if (picture) { if (picture) {
free(picture->filename); free(picture->filename);

1
core/dive.h
View file

@ -375,6 +375,7 @@ struct picture {
for (struct picture *picture = (_divestruct).picture_list; picture; picture = picture->next) for (struct picture *picture = (_divestruct).picture_list; picture; picture = picture->next)
extern struct picture *alloc_picture(); extern struct picture *alloc_picture();
extern void free_picture(struct picture *picture);
extern bool dive_check_picture_time(const struct dive *d, int shift_time, timestamp_t timestamp); extern bool dive_check_picture_time(const struct dive *d, int shift_time, timestamp_t timestamp);
extern void dive_create_picture(struct dive *d, const char *filename, int shift_time, bool match_all); extern void dive_create_picture(struct dive *d, const char *filename, int shift_time, bool match_all);
extern void dive_add_picture(struct dive *d, struct picture *newpic); extern void dive_add_picture(struct dive *d, struct picture *newpic);