colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: drop unused color_option argument from check_colors_file()

Browse Source
This commit is contained in:
Thomas Haller
2018-06-21 17:08:05 +02:00
parent 0be07d0815
commit dbc5eefedb
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
clients/cli/nmcli.c
View File

@@ -340,12 +340,13 @@ typedef enum {
/* Checks whether a particular terminal-colors.d(5) file (.enabled, .disabled or .schem) /* Checks whether a particular terminal-colors.d(5) file (.enabled, .disabled or .schem)
* exists. If contents is non-NULL, it returns the content. */ * exists. If contents is non-NULL, it returns the content. */
static gboolean static gboolean
check_colors_file (NmcColorOption *color_option, check_colors_file (const char *base_dir,
const char *base_dir, const char *name, const char *term, const char *type, const char *name,
const char *term,
const char *type,
char **contents) char **contents)
{ {
char *filename; gs_free char *filename = NULL;
gboolean exists;
filename = g_strdup_printf ("%s/terminal-colors.d/%s%s%s%s%s", filename = g_strdup_printf ("%s/terminal-colors.d/%s%s%s%s%s",
base_dir, base_dir,
@@ -354,12 +355,9 @@ check_colors_file (NmcColorOption *color_option,
(name || term) ? "." : "", (name || term) ? "." : "",
type); type);
if (contents) if (contents)
exists = g_file_get_contents (filename, contents, NULL, NULL); return g_file_get_contents (filename, contents, NULL, NULL);
else else
exists = g_file_test (filename, G_FILE_TEST_EXISTS); return g_file_test (filename, G_FILE_TEST_EXISTS);
g_free (filename);
return exists;
} }
static void static void
@@ -367,12 +365,12 @@ check_colors_files_for_term (char **p_palette_buffer, NmcColorOption *color_opti
const char *base_dir, const char *name, const char *term) const char *base_dir, const char *name, const char *term)
{ {
if ( *color_option == NMC_USE_COLOR_AUTO if ( *color_option == NMC_USE_COLOR_AUTO
&& check_colors_file (color_option, base_dir, name, term, "enable", NULL)) { && check_colors_file (base_dir, name, term, "enable", NULL)) {
*color_option = NMC_USE_COLOR_YES; *color_option = NMC_USE_COLOR_YES;
} }
if ( *color_option == NMC_USE_COLOR_AUTO if ( *color_option == NMC_USE_COLOR_AUTO
&& check_colors_file (color_option, base_dir, name, term, "disable", NULL)) { && check_colors_file (base_dir, name, term, "disable", NULL)) {
*color_option = NMC_USE_COLOR_NO; *color_option = NMC_USE_COLOR_NO;
} }
@@ -382,14 +380,14 @@ check_colors_files_for_term (char **p_palette_buffer, NmcColorOption *color_opti
} }
if (*p_palette_buffer == NULL) if (*p_palette_buffer == NULL)
check_colors_file (color_option, base_dir, name, term, "schem", p_palette_buffer); check_colors_file (base_dir, name, term, "schem", p_palette_buffer);
} }
static void static void
check_colors_files_for_name (char **p_palette_buffer, NmcColorOption *color_option, check_colors_files_for_name (char **p_palette_buffer, NmcColorOption *color_option,
const char *base_dir, const char *name) const char *base_dir, const char *name)
{ {
const gchar *term; const char *term;
/* Take a shortcut if the directory is not there. */ /* Take a shortcut if the directory is not there. */
if (!g_file_test (base_dir, G_FILE_TEST_EXISTS)) if (!g_file_test (base_dir, G_FILE_TEST_EXISTS))