From e5923a105a4faafa872c7d3b33c6d74f49ed7fe0 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 6 Sep 2020 13:27:00 +0200 Subject: [PATCH] cleanup: use taxonomy_get_country() in get_dive_country() get_dive_country() was essentially a reimplementation of taxonomy_get_country(). Let's just use the already existing function. Signed-off-by: Berthold Stoeger --- core/dive.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/dive.c b/core/dive.c index 49a468e5a..2408ba57c 100644 --- a/core/dive.c +++ b/core/dive.c @@ -3797,12 +3797,7 @@ struct dive_site *get_dive_site_for_dive(const struct dive *dive) const char *get_dive_country(const struct dive *dive) { struct dive_site *ds = dive->dive_site; - if (ds) { - int idx = taxonomy_index_for_category(&ds->taxonomy, TC_COUNTRY); - if (idx >= 0) - return ds->taxonomy.category[idx].value; - } - return NULL; + return ds ? taxonomy_get_country(&ds->taxonomy) : NULL; } const char *get_dive_location(const struct dive *dive)