diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-04-10 09:18:38 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-04-10 10:53:03 -0700 |
| commit | 34657f62ae5209b2f1c44efde053aba43e783e5e (patch) | |
| tree | e3d0cee88d852c74d4bf5ff0ec811cc09c534cb9 /core | |
| parent | aa8cadbcdd85ffb34950596c62cb3a3a4272c5e3 (diff) | |
| download | subsurface-34657f62ae5209b2f1c44efde053aba43e783e5e.tar.gz | |
cleanup: remove picture_free()
There is the free_picture() function with the same functionality.
The compiler/linker should recognize that and remove the duplicate
code, but still...
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/dive.c | 10 | ||||
| -rw-r--r-- | core/dive.h | 1 |
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); |