fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 18:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: refactor active_connection_get_state_ord()

Browse source 
Additional logic will be added, that makes the switch() approach
more cumbersome. Use a sorted array instead to find the priority.
This commit is contained in:
Thomas Haller 2023-11-06 19:54:16 +01:00
parent 8e1330964d
commit 8ccd1f7bfe
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/nmcli/connections.c
View file

@ -291,23 +291,29 @@ connection_type_to_display(const char *type, NMMetaAccessorGetType get_type)
static int
active_connection_get_state_ord(NMActiveConnection *active)
{
static const NMActiveConnectionState ordered_states[] = {
NM_ACTIVE_CONNECTION_STATE_UNKNOWN,
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED,
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING,
NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
};
NMActiveConnectionState state;
int i;
/* returns an integer related to @active's state, that can be used for sorting
* active connections based on their activation state. */
if (!active)
return -2;
switch (nm_active_connection_get_state(active)) {
case NM_ACTIVE_CONNECTION_STATE_UNKNOWN:
return 0;
case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED:
return 1;
case NM_ACTIVE_CONNECTION_STATE_DEACTIVATING:
return 2;
case NM_ACTIVE_CONNECTION_STATE_ACTIVATING:
return 3;
case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
return 4;
state = nm_active_connection_get_state(active);
for (i = 0; i < (int) G_N_ELEMENTS(ordered_states); i++) {
if (state == ordered_states[i])
return i;
}
return -1;
}