aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/dive.c10
-rw-r--r--core/dive.h1
2 files changed, 1 insertions, 10 deletions
diff --git a/core/dive.c b/core/dive.c
index 1a55d476a..732e9d5a5 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -3538,14 +3538,6 @@ void dive_add_picture(struct dive *dive, struct picture *newpic)
return;
}
-void picture_free(struct picture *picture)
-{
- if (!picture)
- return;
- free(picture->filename);
- free(picture);
-}
-
// Return true if picture was found and deleted
bool dive_remove_picture(struct dive *d, const char *filename)
{
@@ -3554,7 +3546,7 @@ bool dive_remove_picture(struct dive *d, const char *filename)
picture = &(*picture)->next;
if (*picture) {
struct picture *temp = (*picture)->next;
- picture_free(*picture);
+ free_picture(*picture);
*picture = temp;
invalidate_dive_cache(current_dive);
return true;
diff --git a/core/dive.h b/core/dive.h
index 7637ddc54..1a1022e53 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -228,7 +228,6 @@ extern void create_picture(const char *filename, int shift_time, bool match_all)
extern void dive_add_picture(struct dive *d, struct picture *newpic);
extern bool dive_remove_picture(struct dive *d, const char *filename);
extern bool picture_check_valid_time(timestamp_t timestamp, int shift_time);
-extern void picture_free(struct picture *picture);
extern bool has_gaschange_event(const struct dive *dive, const struct divecomputer *dc, int idx);
extern int explicit_first_cylinder(const struct dive *dive, const struct divecomputer *dc);