diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-09-05 13:23:23 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-09-06 12:59:54 -0700 |
| commit | 6da78a29c4bcd42b93ef0044ec5e005f2ff93e0f (patch) | |
| tree | fa415e566d5b9cb9b84d66a7b60a85cc4bd78c44 | |
| parent | 86c24dd8321664a50a9c0ee4e54e21b21bbe46fc (diff) | |
| download | subsurface-6da78a29c4bcd42b93ef0044ec5e005f2ff93e0f.tar.gz | |
cleanup: add helper function to set taxonomy category
Setting a taxonomy category was cumbersome: the caller had to
make sure that the category-table was allocated. Introduce
a helper function to make that simpler.
Make taxonomy_set_country() the first caller of the new function,
since it is just a special case with category = TC_COUNTRY.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | core/taxonomy.c | 15 | ||||
| -rw-r--r-- | core/taxonomy.h | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/core/taxonomy.c b/core/taxonomy.c index 63c7fc507..45989e6c7 100644 --- a/core/taxonomy.c +++ b/core/taxonomy.c @@ -81,7 +81,7 @@ const char *taxonomy_get_country(struct taxonomy_data *t) return NULL; } -void taxonomy_set_country(struct taxonomy_data *t, const char *country, enum taxonomy_origin origin) +void taxonomy_set_category(struct taxonomy_data *t, enum taxonomy_category category, const char *value, enum taxonomy_origin origin) { int idx = -1; @@ -90,7 +90,7 @@ void taxonomy_set_country(struct taxonomy_data *t, const char *country, enum tax t->category = alloc_taxonomy(); for (int i = 0; i < t->nr; i++) { - if (t->category[i].category == TC_COUNTRY) { + if (t->category[i].category == category) { free((void *)t->category[i].value); t->category[i].value = NULL; idx = i; @@ -100,13 +100,18 @@ void taxonomy_set_country(struct taxonomy_data *t, const char *country, enum tax if (idx == -1) { if (t->nr == TC_NR_CATEGORIES - 1) { // can't add another one - fprintf(stderr, "Error adding country taxonomy\n"); + fprintf(stderr, "Error adding taxonomy category\n"); return; } idx = t->nr++; } - t->category[idx].value = country; + t->category[idx].value = value; t->category[idx].origin = origin; - t->category[idx].category = TC_COUNTRY; + t->category[idx].category = category; +} + +void taxonomy_set_country(struct taxonomy_data *t, const char *country, enum taxonomy_origin origin) +{ fprintf(stderr, "%s: set the taxonomy country to %s\n", __func__, country); + taxonomy_set_category(t, TC_COUNTRY, country, origin); } diff --git a/core/taxonomy.h b/core/taxonomy.h index 3af5160be..97205a48f 100644 --- a/core/taxonomy.h +++ b/core/taxonomy.h @@ -44,6 +44,7 @@ void free_taxonomy(struct taxonomy_data *t); void copy_taxonomy(const struct taxonomy_data *orig, struct taxonomy_data *copy); int taxonomy_index_for_category(const struct taxonomy_data *t, enum taxonomy_category cat); const char *taxonomy_get_country(struct taxonomy_data *t); +void taxonomy_set_category(struct taxonomy_data *t, enum taxonomy_category category, const char *value, enum taxonomy_origin origin); void taxonomy_set_country(struct taxonomy_data *t, const char *country, enum taxonomy_origin origin); #ifdef __cplusplus |