importer: Drop EDROP as it has been merged into DROP

[people/ms/libloc.git] / src / country-list.c

diff --git a/src/country-list.c b/src/country-list.c
index b2aea8b043477be11d2f6832dd57f12e607ab6eb..536fd9e121c08ff6b98784de36b99e121647a8ba 100644 (file)
--- a/src/country-list.c
+++ b/src/country-list.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include <libloc/compat.h>
 #include <libloc/country.h>
 #include <libloc/country-list.h>
 #include <libloc/private.h>
@@ -42,7 +43,7 @@ static int loc_country_list_grow(struct loc_country_list* list) {
        struct loc_country** elements = reallocarray(list->elements,
                        list->elements_size + size, sizeof(*list->elements));
        if (!elements)
-               return -errno;
+               return 1;
 
        list->elements = elements;
        list->elements_size += size;
@@ -81,9 +82,6 @@ static void loc_country_list_free(struct loc_country_list* list) {
 }
 
 LOC_EXPORT struct loc_country_list* loc_country_list_unref(struct loc_country_list* list) {
-       if (!list)
-               return NULL;
-
        if (--list->refcount > 0)
                return list;
 
@@ -159,8 +157,8 @@ LOC_EXPORT int loc_country_list_contains_code(
                // Ignore invalid country codes which would never match
                if (errno == EINVAL)
                        return 0;
-               else
-                       return r;
+
+               return r;
        }
 
        r = loc_country_list_contains(list, country);