diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-09-06 13:13:36 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-06 12:59:54 -0700 |
| commit | f93acdace7234b727dec830adbaed6b9edb3e6ac (patch) | |
| tree | fe2e4daba78c99fb5f798c6c5b4247cdc03c2d6d /core/taxonomy.c | |
| parent | 7f1def86021eda8cc01911b4944be4bc38ae65fe (diff) | |
| download | subsurface-f93acdace7234b727dec830adbaed6b9edb3e6ac.tar.gz | |
cleanup: make alloc_taxonomy local to taxonomy.c
The alloc_taxonomy()/free_taxonomy() interface was exceedingly strange.
The former gave a "struct taxonomy", the latter took a "struct taxonomy_data".
To make things worse, is appears as if the names "taxonomy" and "taxonoma_data"
are reversed: the latter contains the former.
In any case, the alloc_taxonomy() call is not needed anymore from outside
taxonomy.c, as these memory-management details are now hidden in accessor
functions. Therefore, make the function local to taxonomy.c. Moreover,
rename it to "alloc_taxonomy_table()" and let it take a "taxonomy_data"
structure for symmetry with "free_taxonomy()".
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/taxonomy.c')
| -rw-r--r-- | core/taxonomy.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/taxonomy.c b/core/taxonomy.c index 15086d28d..e786ba45d 100644 --- a/core/taxonomy.c +++ b/core/taxonomy.c @@ -26,9 +26,10 @@ char *taxonomy_api_names[TC_NR_CATEGORIES] = { "adminName3" }; -struct taxonomy *alloc_taxonomy() +static void alloc_taxonomy_table(struct taxonomy_data *t) { - return calloc(TC_NR_CATEGORIES, sizeof(struct taxonomy)); + if (!t->category) + t->category = calloc(TC_NR_CATEGORIES, sizeof(struct taxonomy)); } void free_taxonomy(struct taxonomy_data *t) @@ -47,8 +48,7 @@ void copy_taxonomy(const struct taxonomy_data *orig, struct taxonomy_data *copy) if (orig->category == NULL) { free_taxonomy(copy); } else { - if (copy->category == NULL) - copy->category = alloc_taxonomy(); + alloc_taxonomy_table(copy); for (int i = 0; i < TC_NR_CATEGORIES; i++) { if (i < copy->nr) { free((void *)copy->category[i].value); @@ -86,8 +86,7 @@ void taxonomy_set_category(struct taxonomy_data *t, enum taxonomy_category categ int idx = -1; // make sure we have taxonomy data allocated - if (!t->category) - t->category = alloc_taxonomy(); + alloc_taxonomy_table(t); for (int i = 0; i < t->nr; i++) { if (t->category[i].category == category) { |