diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-02-22 20:52:50 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | 92e6e2bba17ae91e1f8e5d63154323586f6ea5a2 (patch) | |
| tree | 2b71b7b8bf41026c016cb7b0654d9bfdcd49fb7a /core | |
| parent | 53b4d84a6ebebc4792f3b03cb926a454075fda34 (diff) | |
| download | subsurface-92e6e2bba17ae91e1f8e5d63154323586f6ea5a2.tar.gz | |
Core: introduce taglist_copy() function
Taglists were only copied in dive.c using the STRUCTURED_LIST_COPY
macro. Export that functionality in a function. This will be
needed for undo of dive-pasting.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/dive.c | 9 | ||||
| -rw-r--r-- | core/dive.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/dive.c b/core/dive.c index f43697c65..b82970862 100644 --- a/core/dive.c +++ b/core/dive.c @@ -667,7 +667,7 @@ void selective_copy_dive(const struct dive *s, struct dive *d, struct dive_compo add_dive_to_dive_site(d, s->dive_site); } if (what.tags) - STRUCTURED_LIST_COPY(struct tag_entry, s->tag_list, d->tag_list, copy_tl); + d->tag_list = taglist_copy(s->tag_list); if (what.cylinders) copy_cylinders(s, d, false); if (what.weights) @@ -3359,6 +3359,13 @@ void taglist_free(struct tag_entry *entry) STRUCTURED_LIST_FREE(struct tag_entry, entry, free) } +struct tag_entry *taglist_copy(struct tag_entry *s) +{ + struct tag_entry *res; + STRUCTURED_LIST_COPY(struct tag_entry, s, res, copy_tl); + return res; +} + /* Merge src1 and src2, write to *dst */ static void taglist_merge(struct tag_entry **dst, struct tag_entry *src1, struct tag_entry *src2) { diff --git a/core/dive.h b/core/dive.h index 7075cb143..06abc0df2 100644 --- a/core/dive.h +++ b/core/dive.h @@ -221,6 +221,7 @@ void taglist_cleanup(struct tag_entry **tag_list); void taglist_init_global(); void taglist_free(struct tag_entry *tag_list); +struct tag_entry *taglist_copy(struct tag_entry *s); bool taglist_contains(struct tag_entry *tag_list, const char *tag); struct extra_data { |