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

cli/trivial: fix indention and whitespace

Browse Source
This commit is contained in:
Thomas Haller
2016-03-30 18:14:50 +02:00
parent 1422ce0a6a
commit 6fa521b384
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
clients/cli/connections.c
View File

@@ -4768,43 +4768,43 @@ complete_slave (NMSettingConnection *s_con,
gboolean ask, gboolean ask,
GError **error) GError **error)
{ {
char *master_ask = NULL; char *master_ask = NULL;
const char *checked_master = NULL; const char *checked_master = NULL;
if (type) if (type)
g_print (_("Warning: 'type' is ignored. " g_print (_("Warning: 'type' is ignored. "
"Use 'nmcli connection add \"%s\" ...' instead."), "Use 'nmcli connection add \"%s\" ...' instead."),
type); type);
if (nm_setting_connection_get_master (s_con)) { if (nm_setting_connection_get_master (s_con)) {
/* Master already set. */ /* Master already set. */
if (master) { if (master) {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: redundant 'master' option."));
return FALSE;
}
return TRUE;
}
if (!master && ask)
master = master_ask = nmc_readline (PROMPT_MASTER);
if (!master) {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: 'master' is required.")); _("Error: redundant 'master' option."));
return FALSE; return FALSE;
} }
/* Verify master argument */
checked_master = normalized_master_for_slave (all_connections, master, slave_type, NULL);
/* Change properties in 'connection' setting */
g_object_set (s_con,
NM_SETTING_CONNECTION_MASTER, checked_master,
NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
NULL);
g_free (master_ask);
return TRUE; return TRUE;
}
if (!master && ask)
master = master_ask = nmc_readline (PROMPT_MASTER);
if (!master) {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: 'master' is required."));
return FALSE;
}
/* Verify master argument */
checked_master = normalized_master_for_slave (all_connections, master, slave_type, NULL);
/* Change properties in 'connection' setting */
g_object_set (s_con,
NM_SETTING_CONNECTION_MASTER, checked_master,
NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
NULL);
g_free (master_ask);
return TRUE;
} }
static gboolean static gboolean
@@ -7041,7 +7041,7 @@ do_connection_add (NmCli *nmc, int argc, char **argv)
NM_SETTING_CONNECTION_TYPE, setting_name, NM_SETTING_CONNECTION_TYPE, setting_name,
NM_SETTING_CONNECTION_AUTOCONNECT, auto_bool, NM_SETTING_CONNECTION_AUTOCONNECT, auto_bool,
NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NM_SETTING_CONNECTION_INTERFACE_NAME, ifname,
NM_SETTING_CONNECTION_MASTER, checked_master, NM_SETTING_CONNECTION_MASTER, checked_master,
NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type,
NULL); NULL);
g_free (uuid); g_free (uuid);