meson.build: fix build with meson > 0.38.1

[ncmpc.git] / src / colors.c

diff --git a/src/colors.c b/src/colors.c
index 0c79e13d57d56e72b616cde344032e13efe29b9a..5a79fd9bbfff8b2c6a7967e499af18df19c98544 100644 (file)
--- a/src/colors.c
+++ b/src/colors.c
@@ -80,7 +80,7 @@ colors_lookup_by_name(const char *name)
        return NULL;
 }
 
-static int
+static void
 colors_update_pair(enum color id)
 {
        assert(id > 0 && id < COLOR_END);
@@ -93,7 +93,6 @@ colors_update_pair(enum color id)
        init_pair(id,
                (fg < 0 ? -1 : fg),
                (bg < 0 ? -1 : bg));
-       return 0;
 }
 
 int
@@ -152,7 +151,8 @@ colors_str2color(const char *str)
                        if (cur != endptr && endptr[0] == '\0') {
                                color |= tmp;
                        } else {
-                               fprintf(stderr,_("Warning: Unknown color - %s\n"), str);
+                               fprintf(stderr, "%s: %s\n",
+                                       _("Unknown color"), str);
                                return COLOR_ERROR;
                        }
                }
@@ -165,13 +165,13 @@ colors_str2color(const char *str)
 /* This function is called from conf.c before curses have been started,
  * it adds the definition to the color_definition_list and init_color() is
  * done in colors_start() */
-int
+bool
 colors_define(const char *name, short r, short g, short b)
 {
        int color = colors_str2color(name);
 
        if (color < 0)
-               return color;
+               return false;
 
        color_definition_entry_t *entry =
                g_malloc(sizeof(color_definition_entry_t));
@@ -182,29 +182,29 @@ colors_define(const char *name, short r, short g, short b)
 
        color_definition_list = g_list_append(color_definition_list, entry);
 
-       return 0;
+       return true;
 }
 
-int
+bool
 colors_assign(const char *name, const char *value)
 {
        color_entry_t *entry = colors_lookup_by_name(name);
 
        if (!entry) {
-               fprintf(stderr,_("Warning: Unknown color field - %s\n"), name);
-               return -1;
+               fprintf(stderr, "%s: %s",
+                       _("Unknown color field"), name);
+               return false;
        }
 
        const int color = colors_str2color(value);
        if (color == COLOR_ERROR)
-               return -1;
+               return false;
 
        entry->color = color;
-       return 0;
+       return true;
 }
 
-
-int
+void
 colors_start(void)
 {
        if (has_colors()) {
@@ -240,22 +240,13 @@ colors_start(void)
 
        /* free the color_definition_list */
        if (color_definition_list) {
-               GList *list = color_definition_list;
-
-               while (list) {
-                       g_free(list->data);
-                       list=list->next;
-               }
-
-               g_list_free(color_definition_list);
+               g_list_free_full(color_definition_list, g_free);
                color_definition_list = NULL;
        }
-
-       return 0;
 }
 #endif
 
-int
+void
 colors_use(WINDOW *w, enum color id)
 {
        color_entry_t *entry = &colors[id];
@@ -279,6 +270,4 @@ colors_use(WINDOW *w, enum color id)
 #ifdef ENABLE_COLORS
        }
 #endif
-
-       return 0;
 }