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

cli: prettify check_activated() to by using switch() statement

Browse Source 
No change in behavior.
This commit is contained in:
Thomas Haller
2017-05-24 21:56:29 +02:00
parent 31656a066b
commit 4f69c1e85e
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
clients/cli/connections.c
View File

@@ -2095,12 +2095,10 @@ check_activated (ActivateConnectionInfo *info)
NmCli *nmc = info->nmc; NmCli *nmc = info->nmc;
NMDevice *device = info->device; NMDevice *device = info->device;
NMActiveConnection *active = info->active; NMActiveConnection *active = info->active;
NMActiveConnectionState ac_state;
NMActiveConnectionStateReason ac_reason; NMActiveConnectionStateReason ac_reason;
NMDeviceState dev_state; NMDeviceState dev_state;
NMDeviceStateReason dev_reason; NMDeviceStateReason dev_reason;
ac_state = nm_active_connection_get_state (active);
ac_reason = nm_active_connection_get_state_reason (active); ac_reason = nm_active_connection_get_state_reason (active);
if (device) { if (device) {
@@ -2108,14 +2106,19 @@ check_activated (ActivateConnectionInfo *info)
dev_reason = nm_device_get_state_reason (device); dev_reason = nm_device_get_state_reason (device);
} }
if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { switch (nm_active_connection_get_state (active)) {
case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
nmc_terminal_erase_line (); nmc_terminal_erase_line ();
g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), g_print (_("Connection successfully activated (D-Bus active path: %s)\n"),
nm_object_get_path (NM_OBJECT (active))); nm_object_get_path (NM_OBJECT (active)));
activate_connection_info_finish (info); activate_connection_info_finish (info);
} else if (ac_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) { break;
if (device && ac_reason == NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED) {
case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED:
if ( device
&& ac_reason == NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED) {
if (dev_state == NM_DEVICE_STATE_FAILED || dev_state == NM_DEVICE_STATE_DISCONNECTED) { if (dev_state == NM_DEVICE_STATE_FAILED || dev_state == NM_DEVICE_STATE_DISCONNECTED) {
g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"), g_string_printf (nmc->return_text, _("Error: Connection activation failed: %s"),
nmc_device_reason_to_string (dev_reason)); nmc_device_reason_to_string (dev_reason));
@@ -2131,7 +2134,9 @@ check_activated (ActivateConnectionInfo *info)
nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
activate_connection_info_finish (info); activate_connection_info_finish (info);
} }
} else if (ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { break;
case NM_ACTIVE_CONNECTION_STATE_ACTIVATING:
/* activating master connection does not automatically activate any slaves, so their /* activating master connection does not automatically activate any slaves, so their
* active connection state will not progress beyond ACTIVATING state. * active connection state will not progress beyond ACTIVATING state.
* Monitor the device instead. */ * Monitor the device instead. */
@@ -2147,14 +2152,18 @@ check_activated (ActivateConnectionInfo *info)
&& ( NM_IS_DEVICE_BOND (device) && ( NM_IS_DEVICE_BOND (device)
|| NM_IS_DEVICE_TEAM (device) || NM_IS_DEVICE_TEAM (device)
|| NM_IS_DEVICE_BRIDGE (device)) || NM_IS_DEVICE_BRIDGE (device))
&& dev_state >= NM_DEVICE_STATE_IP_CONFIG && dev_state >= NM_DEVICE_STATE_IP_CONFIG
&& dev_state <= NM_DEVICE_STATE_ACTIVATED) { && dev_state <= NM_DEVICE_STATE_ACTIVATED) {
if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
nmc_terminal_erase_line (); nmc_terminal_erase_line ();
g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"), g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"),
nm_object_get_path (NM_OBJECT (active))); nm_object_get_path (NM_OBJECT (active)));
activate_connection_info_finish (info); activate_connection_info_finish (info);
} }
break;
default:
break;
} }
} }