colors: return bool instead of int

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 83c11c5f194b6359ffdd16a202355b64e98914e8..496dcab6dc974cc429247fd0ee9fb54a1e9a92a2 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,15 +24,14 @@
 #include "command.h"
 #include "colors.h"
 #include "screen_list.h"
+#include "options.h"
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
@@ -48,6 +47,7 @@
 #define CONF_COLOR "color"
 #define CONF_COLOR_DEFINITION "colordef"
 #define CONF_LIST_FORMAT "list-format"
+#define CONF_SEARCH_FORMAT "search-format"
 #define CONF_STATUS_FORMAT "status-format"
 #define CONF_XTERM_TITLE_FORMAT "xterm-title-format"
 #define CONF_LIST_WRAP "wrap-around"
@@ -121,7 +121,7 @@ parse_key_value(char *str, char **end)
        }
 }
 
-static int
+static bool
 parse_key_definition(char *str)
 {
        /* get the command name */
@@ -138,7 +138,7 @@ parse_key_definition(char *str)
                /* the hotkey configuration contains an unknown
                   command */
                print_error(_("Unknown command"), buf);
-               return -1;
+               return false;
        }
 
        /* skip whitespace */
@@ -151,7 +151,7 @@ parse_key_definition(char *str)
        if (*buf == 0) {
                /* the hotkey configuration line is incomplete */
                print_error(_("Incomplete hotkey configuration"), str);
-               return -1;
+               return false;
        }
 
        /* parse key values */
@@ -169,7 +169,7 @@ parse_key_definition(char *str)
        }
 
        if (key < 0)
-               return -1;
+               return false;
 
        return assign_keys(cmd, keys);
 }
@@ -209,12 +209,12 @@ separate_value(char *p)
        return g_strchug(value);
 }
 
-static int
+static bool
 parse_color(char *str)
 {
        char *value = separate_value(str);
        if (value == NULL)
-               return -1;
+               return false;
 
        return colors_assign(str, value);
 }
@@ -239,19 +239,19 @@ after_comma(char *p)
        return comma;
 }
 
-static int
+static bool
 parse_color_definition(char *str)
 {
        char *value = separate_value(str);
        if (value == NULL)
-               return -1;
+               return false;
 
        /* get the command name */
        short color = colors_str2color(str);
        if (color < 0) {
                char buf[MAX_LINE_LENGTH];
                print_error(_("Bad color name"), buf);
-               return -1;
+               return false;
        }
 
        /* parse r,g,b values */
@@ -261,13 +261,13 @@ parse_color_definition(char *str)
                char *next = after_comma(value), *endptr;
                if (*value == 0) {
                        print_error(_("Incomplete color definition"), str);
-                       return -1;
+                       return false;
                }
 
                rgb[i] = strtol(value, &endptr, 0);
                if (endptr == value || *endptr != 0) {
                        print_error(_("Invalid number"), value);
-                       return -1;
+                       return false;
                }
 
                value = next;
@@ -275,7 +275,7 @@ parse_color_definition(char *str)
 
        if (*value != 0) {
                print_error(_("Malformed color definition"), str);
-               return -1;
+               return false;
        }
 
        return colors_define(str, rgb[0], rgb[1], rgb[2]);
@@ -435,6 +435,10 @@ parse_line(char *line)
        else if (!strcasecmp(CONF_LIST_FORMAT, name)) {
                g_free(options.list_format);
                options.list_format = get_format(value);
+               /* search format string */
+       } else if (!strcasecmp(CONF_SEARCH_FORMAT, name)) {
+               g_free(options.search_format);
+               options.search_format = get_format(value);
                /* status format string */
        } else if (!strcasecmp(CONF_STATUS_FORMAT, name)) {
                g_free(options.status_format);
@@ -497,11 +501,8 @@ parse_line(char *line)
                g_free(options.scroll_sep);
                options.scroll_sep = get_format(value);
        } else if (!strcasecmp(CONF_DISPLAY_TIME, name))
-#ifdef NCMPC_MINI
+               /* obsolete, ignore */
                {}
-#else
-               options.display_time = str2bool(value);
-#endif
        else if (!strcasecmp(CONF_JUMP_PREFIX_ONLY, name))
 #ifdef NCMPC_MINI
                {}
@@ -578,19 +579,19 @@ read_rc_file(char *filename)
        return 0;
 }
 
-int
+bool
 check_user_conf_dir(void)
 {
        char *directory = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
 
        if (g_file_test(directory, G_FILE_TEST_IS_DIR)) {
                g_free(directory);
-               return 0;
+               return true;
        }
 
-       int retval = g_mkdir(directory, 0755);
+       bool success = g_mkdir(directory, 0755) == 0;
        g_free(directory);
-       return retval;
+       return success;
 }
 
 char *
@@ -612,7 +613,6 @@ build_system_conf_filename(void)
 
        for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
        {
-               g_message (*system_data_dirs);
                pathname = g_build_filename(*system_data_dirs, PACKAGE, "ncmpc.conf", NULL);
                if (g_file_test(pathname, G_FILE_TEST_EXISTS))
                {
@@ -649,7 +649,6 @@ g_build_system_key_binding_filename(void)
 
        for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
        {
-               g_message (*system_data_dirs);
                pathname = g_build_filename(*system_data_dirs, PACKAGE, "keys.conf", NULL);
                if (g_file_test(pathname, G_FILE_TEST_EXISTS))
                {