mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:23:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: use taxonomy_index_for_category() in taxonomy_set_category()

Browse source 
Instead of recoding the "search for category" loop, reuse the already
existing functionality.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-09-06 13:23:19 +02:00 • committed by Dirk Hohndel
parent f93acdace7
commit 754b4a5c9d
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/taxonomy.c
View file

@ -83,26 +83,19 @@ 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_category(struct taxonomy_data *t, enum taxonomy_category category, const char *value, enum taxonomy_origin origin)
{ {
int idx = -1; int idx = taxonomy_index_for_category(t, category);
// make sure we have taxonomy data allocated if (idx < 0) {
alloc_taxonomy_table(t); alloc_taxonomy_table(t); // make sure we have taxonomy data allocated
for (int i = 0; i < t->nr; i++) {
if (t->category[i].category == category) {
free((void *)t->category[i].value);
t->category[i].value = NULL;
idx = i;
break;
}
}
if (idx == -1) {
if (t->nr == TC_NR_CATEGORIES - 1) { if (t->nr == TC_NR_CATEGORIES - 1) {
// can't add another one // can't add another one
fprintf(stderr, "Error adding taxonomy category\n"); fprintf(stderr, "Error adding taxonomy category\n");
return; return;
} }
idx = t->nr++; idx = t->nr++;
} else {
free((void *)t->category[idx].value);
t->category[idx].value = NULL;
} }
t->category[idx].value = strdup(value); t->category[idx].value = strdup(value);
t->category[idx].origin = origin; t->category[idx].origin = origin;