fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: implement queued_state_to_string() via NM_UTILS_LOOKUP_STR_DEFINE_STATIC()

Browse source 
(cherry picked from commit 8ac14b5400)
This commit is contained in:
Thomas Haller 2017-01-27 14:13:09 +01:00
parent 9822299d41
commit 78eaabf98f
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/devices/nm-device.c
View file

@ -500,29 +500,22 @@ static void _cancel_activation (NMDevice *self);
/*****************************************************************************/ /*****************************************************************************/
static const char *state_table[] = { NM_UTILS_LOOKUP_STR_DEFINE_STATIC (queued_state_to_string, NMDeviceState,
[NM_DEVICE_STATE_UNKNOWN] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "unknown", NM_UTILS_LOOKUP_DEFAULT ( NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "???"),
[NM_DEVICE_STATE_UNMANAGED] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "unmanaged", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_UNKNOWN, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "unknown"),
[NM_DEVICE_STATE_UNAVAILABLE] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "unavailable", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_UNMANAGED, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "unmanaged"),
[NM_DEVICE_STATE_DISCONNECTED] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "disconnected", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_UNAVAILABLE, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "unavailable"),
[NM_DEVICE_STATE_PREPARE] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "prepare", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_DISCONNECTED, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "disconnected"),
[NM_DEVICE_STATE_CONFIG] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "config", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_PREPARE, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "prepare"),
[NM_DEVICE_STATE_NEED_AUTH] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "need-auth", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_CONFIG, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "config"),
[NM_DEVICE_STATE_IP_CONFIG] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "ip-config", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_NEED_AUTH, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "need-auth"),
[NM_DEVICE_STATE_IP_CHECK] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "ip-check", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_IP_CONFIG, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "ip-config"),
[NM_DEVICE_STATE_SECONDARIES] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "secondaries", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_IP_CHECK, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "ip-check"),
[NM_DEVICE_STATE_ACTIVATED] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "activated", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_SECONDARIES, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "secondaries"),
[NM_DEVICE_STATE_DEACTIVATING] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "deactivating", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_ACTIVATED, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "activated"),
[NM_DEVICE_STATE_FAILED] = NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "failed", NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_DEACTIVATING, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "deactivating"),
}; NM_UTILS_LOOKUP_STR_ITEM (NM_DEVICE_STATE_FAILED, NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "failed"),
);
static const char *
queued_state_to_string (NMDeviceState state)
{
if ((gsize) state < G_N_ELEMENTS (state_table))
return state_table[state];
return state_table[NM_DEVICE_STATE_UNKNOWN];
}
static const char * static const char *
state_to_string (NMDeviceState state) state_to_string (NMDeviceState state)