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

cli: cleanup internal functions in "clients/cli/connections.c"

Browse Source 
There should be no change in behavior. Use cleanup attribute.
This commit is contained in:
Thomas Haller
2020-05-13 10:14:29 +02:00
parent 67283b4932
commit 801c895aa6
1 changed files with 50 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
clients/cli/connections.c
View File

@@ -3444,10 +3444,10 @@ static const char *
check_valid_name_toplevel (const char *val, const char **slave_type, GError **error) check_valid_name_toplevel (const char *val, const char **slave_type, GError **error)
{ {
gs_unref_ptrarray GPtrArray *tmp_arr = NULL; gs_unref_ptrarray GPtrArray *tmp_arr = NULL;
const char *str;
GError *tmp_err = NULL;
int i;
const NMMetaSettingInfoEditor *setting_info; const NMMetaSettingInfoEditor *setting_info;
gs_free_error GError *tmp_err = NULL;
const char *str;
int i;
NM_SET_OUT (slave_type, NULL); NM_SET_OUT (slave_type, NULL);
@@ -3468,14 +3468,13 @@ check_valid_name_toplevel (const char *val, const char **slave_type, GError **er
str = nmc_string_is_valid (val, (const char **) tmp_arr->pdata, &tmp_err); str = nmc_string_is_valid (val, (const char **) tmp_arr->pdata, &tmp_err);
if (!str) { if (!str) {
if (tmp_err->code == 1) if (tmp_err->code == 1)
g_propagate_error (error, tmp_err); g_propagate_error (error, g_steal_pointer (&tmp_err));
else { else {
/* We want to handle aliases, so construct own error message */ /* We want to handle aliases, so construct own error message */
char *err_str = get_valid_options_string_toplevel (); gs_free char *err_str = NULL;
err_str = get_valid_options_string_toplevel ();
g_set_error (error, 1, 0, _("'%s' not among [%s]"), val, err_str); g_set_error (error, 1, 0, _("'%s' not among [%s]"), val, err_str);
g_free (err_str);
g_clear_error (&tmp_err);
} }
return NULL; return NULL;
} }
@@ -3669,15 +3668,12 @@ is_setting_valid (NMConnection *connection, const NMMetaSettingValidPartItem *co
static char * static char *
is_property_valid (NMSetting *setting, const char *property, GError **error) is_property_valid (NMSetting *setting, const char *property, GError **error)
{ {
char **valid_props = NULL; gs_strfreev char **valid_props = NULL;
const char *prop_name; const char *prop_name;
char *ret;
valid_props = nmc_setting_get_valid_properties (setting); valid_props = nmc_setting_get_valid_properties (setting);
prop_name = nmc_string_is_valid (property, (const char **) valid_props, error); prop_name = nmc_string_is_valid (property, (const char **) valid_props, error);
ret = g_strdup (prop_name); return g_strdup (prop_name);
g_strfreev (valid_props);
return ret;
} }
static char * static char *
@@ -5972,19 +5968,23 @@ extract_setting_and_property (const char *prompt, const char *line,
} }
static void static void
get_setting_and_property (const char *prompt, const char *line, get_setting_and_property (const char *prompt,
NMSetting **setting_out, char**property_out) const char *line,
NMSetting **setting_out,
char **property_out)
{ {
const NMMetaSettingValidPartItem *const*valid_settings_main; const NMMetaSettingValidPartItem *const*valid_settings_main;
const NMMetaSettingValidPartItem *const*valid_settings_slave; const NMMetaSettingValidPartItem *const*valid_settings_slave;
const char *setting_name; gs_unref_object NMSetting *setting = NULL;
NMSetting *setting = NULL; gs_free char *property = NULL;
char *property = NULL;
char *sett = NULL, *prop = NULL;
NMSettingConnection *s_con; NMSettingConnection *s_con;
gs_free char *sett = NULL;
gs_free char *prop = NULL;
const char *s_type = NULL; const char *s_type = NULL;
const char *setting_name;
extract_setting_and_property (prompt, line, &sett, &prop); extract_setting_and_property (prompt, line, &sett, &prop);
if (sett) { if (sett) {
/* Is this too much (and useless?) effort for an unlikely case? */ /* Is this too much (and useless?) effort for an unlikely case? */
s_con = nm_connection_get_setting_connection (nmc_tab_completion.connection); s_con = nm_connection_get_setting_connection (nmc_tab_completion.connection);
@@ -5994,23 +5994,22 @@ get_setting_and_property (const char *prompt, const char *line,
valid_settings_main = get_valid_settings_array (nmc_tab_completion.con_type); valid_settings_main = get_valid_settings_array (nmc_tab_completion.con_type);
valid_settings_slave = nm_meta_setting_info_valid_parts_for_slave_type (s_type, NULL); valid_settings_slave = nm_meta_setting_info_valid_parts_for_slave_type (s_type, NULL);
setting_name = check_valid_name (sett, valid_settings_main, setting_name = check_valid_name (sett,
valid_settings_slave, NULL); valid_settings_main,
valid_settings_slave,
NULL);
setting = nm_meta_setting_info_editor_new_setting (nm_meta_setting_info_editor_find_by_name (setting_name, FALSE), setting = nm_meta_setting_info_editor_new_setting (nm_meta_setting_info_editor_find_by_name (setting_name, FALSE),
NM_META_ACCESSOR_SETTING_INIT_TYPE_DEFAULT); NM_META_ACCESSOR_SETTING_INIT_TYPE_DEFAULT);
} else } else
setting = nmc_tab_completion.setting ? g_object_ref (nmc_tab_completion.setting) : NULL; setting = nm_g_object_ref (nmc_tab_completion.setting);
if (setting && prop) if (setting && prop)
property = is_property_valid (setting, prop, NULL); property = is_property_valid (setting, prop, NULL);
else else
property = g_strdup (nmc_tab_completion.property); property = g_strdup (nmc_tab_completion.property);
*setting_out = setting; *setting_out = g_steal_pointer (&setting);
*property_out = property; *property_out = g_steal_pointer (&property);
g_free (sett);
g_free (prop);
} }
static gboolean static gboolean
@@ -6020,7 +6019,7 @@ _get_and_check_property (const char *prompt,
const char **array_multi, const char **array_multi,
gboolean *multi) gboolean *multi)
{ {
char *prop; gs_free char *prop = NULL;
gboolean found = FALSE; gboolean found = FALSE;
extract_setting_and_property (prompt, line, NULL, &prop); extract_setting_and_property (prompt, line, NULL, &prop);
@@ -6029,7 +6028,6 @@ _get_and_check_property (const char *prompt,
found = !!nmc_string_is_valid (prop, array, NULL); found = !!nmc_string_is_valid (prop, array, NULL);
if (array_multi && multi) if (array_multi && multi)
*multi = !!nmc_string_is_valid (prop, array_multi, NULL); *multi = !!nmc_string_is_valid (prop, array_multi, NULL);
g_free (prop);
} }
return found; return found;
} }
@@ -6107,33 +6105,26 @@ should_complete_property_values (const char *prompt, const char *line, gboolean
static gboolean static gboolean
_setting_property_is_boolean (NMSetting *setting, const char *property_name) _setting_property_is_boolean (NMSetting *setting, const char *property_name)
{ {
GParamSpec *pspec; const GParamSpec *pspec;
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); nm_assert (NM_IS_SETTING (setting));
g_return_val_if_fail (property_name, FALSE); nm_assert (property_name);
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property_name); pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property_name);
if (pspec && pspec->value_type == G_TYPE_BOOLEAN) return pspec
return TRUE; && pspec->value_type == G_TYPE_BOOLEAN;
return FALSE;
} }
static gboolean static gboolean
should_complete_boolean (const char *prompt, const char *line) should_complete_boolean (const char *prompt, const char *line)
{ {
NMSetting *setting; gs_unref_object NMSetting *setting = NULL;
char *property; gs_free char *property = NULL;
gboolean is_boolean = FALSE;
get_setting_and_property (prompt, line, &setting, &property); get_setting_and_property (prompt, line, &setting, &property);
if (setting && property) return setting
is_boolean = _setting_property_is_boolean (setting, property); && property
&& _setting_property_is_boolean (setting, property);
if (setting)
g_object_unref (setting);
g_free (property);
return is_boolean;
} }
static char * static char *
@@ -6160,11 +6151,11 @@ extern int rl_complete_with_tilde_expansion;
static char ** static char **
nmcli_editor_tab_completion (const char *text, int start, int end) nmcli_editor_tab_completion (const char *text, int start, int end)
{ {
char **match_array = NULL;
const char *line = rl_line_buffer;
rl_compentry_func_t *generator_func = NULL; rl_compentry_func_t *generator_func = NULL;
char *prompt_tmp; const char *line = rl_line_buffer;
char *word = NULL; gs_free char *prompt_tmp = NULL;
gs_free char *word = NULL;
char **match_array = NULL;
size_t n1; size_t n1;
int num; int num;
@@ -6288,8 +6279,6 @@ nmcli_editor_tab_completion (const char *text, int start, int end)
if (generator_func) if (generator_func)
match_array = rl_completion_matches (text, generator_func); match_array = rl_completion_matches (text, generator_func);
g_free (prompt_tmp);
g_free (word);
return match_array; return match_array;
} }
@@ -7114,9 +7103,10 @@ property_edit_submenu (NmCli *nmc,
else else
g_print (_("Unknown command argument: '%s'\n"), cmd_property_arg); g_print (_("Unknown command argument: '%s'\n"), cmd_property_arg);
} else { } else {
char *prop_val = nmc_setting_get_property (curr_setting, prop_name, NULL); gs_free char *prop_val = NULL;
prop_val = nmc_setting_get_property (curr_setting, prop_name, NULL);
g_print ("%s: %s\n", prop_name, prop_val); g_print ("%s: %s\n", prop_name, prop_val);
g_free (prop_val);
} }
break; break;
@@ -7198,7 +7188,7 @@ ask_check_setting (const NmcConfig *nmc_config,
const NMMetaSettingValidPartItem *const*valid_settings_slave, const NMMetaSettingValidPartItem *const*valid_settings_slave,
const char *valid_settings_str) const char *valid_settings_str)
{ {
char *setting_name_user; gs_free char *setting_name_user = NULL;
const char *setting_name; const char *setting_name;
GError *err = NULL; GError *err = NULL;
@@ -7218,7 +7208,6 @@ ask_check_setting (const NmcConfig *nmc_config,
g_print (_("Error: invalid setting name; %s\n"), err->message); g_print (_("Error: invalid setting name; %s\n"), err->message);
g_clear_error (&err); g_clear_error (&err);
} }
g_free (setting_name_user);
return setting_name; return setting_name;
} }
@@ -7228,9 +7217,9 @@ ask_check_property (const NmcConfig *nmc_config,
const char **valid_props, const char **valid_props,
const char *valid_props_str) const char *valid_props_str)
{ {
char *prop_name_user; gs_free_error GError *tmp_err = NULL;
gs_free char *prop_name_user = NULL;
const char *prop_name; const char *prop_name;
GError *tmp_err = NULL;
if (!arg) { if (!arg) {
g_print (_("Available properties: %s\n"), valid_props_str); g_print (_("Available properties: %s\n"), valid_props_str);
@@ -7240,11 +7229,10 @@ ask_check_property (const NmcConfig *nmc_config,
} else } else
prop_name_user = g_strdup (arg); prop_name_user = g_strdup (arg);
if (!(prop_name = nmc_string_is_valid (prop_name_user, valid_props, &tmp_err))) { prop_name = nmc_string_is_valid (prop_name_user, valid_props, &tmp_err);
if (!prop_name)
g_print (_("Error: property %s\n"), tmp_err->message); g_print (_("Error: property %s\n"), tmp_err->message);
g_clear_error (&tmp_err);
}
g_free (prop_name_user);
return prop_name; return prop_name;
} }
@@ -7258,6 +7246,7 @@ update_connection_timestamp (NMConnection *src, NMConnection *dst)
s_con_dst = nm_connection_get_setting_connection (dst); s_con_dst = nm_connection_get_setting_connection (dst);
if (s_con_src && s_con_dst) { if (s_con_src && s_con_dst) {
guint64 timestamp = nm_setting_connection_get_timestamp (s_con_src); guint64 timestamp = nm_setting_connection_get_timestamp (s_con_src);
g_object_set (s_con_dst, NM_SETTING_CONNECTION_TIMESTAMP, timestamp, NULL); g_object_set (s_con_dst, NM_SETTING_CONNECTION_TIMESTAMP, timestamp, NULL);
} }
} }