fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-24 19:30:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: use NM_UTILS_STRING_LOOKUP_TABLE_ITEM() macro

Browse source
This commit is contained in:
Thomas Haller 2016-01-24 11:35:26 +01:00
parent 8956ea661c
commit 3ed2488d74
2 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,69 +461,69 @@ state_to_string (NMDeviceState state)
}
NM_UTILS_STRING_LOOKUP_TABLE_DEFINE_STATIC (_reason_to_string, NMDeviceStateReason, NULL,
[NM_DEVICE_STATE_REASON_UNKNOWN] = "unknown",
[NM_DEVICE_STATE_REASON_NONE] = "none",
[NM_DEVICE_STATE_REASON_NOW_MANAGED] = "managed",
[NM_DEVICE_STATE_REASON_NOW_UNMANAGED] = "unmanaged",
[NM_DEVICE_STATE_REASON_CONFIG_FAILED] = "config-failed",
[NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE] = "ip-config-unavailable",
[NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED] = "ip-config-expired",
[NM_DEVICE_STATE_REASON_NO_SECRETS] = "no-secrets",
[NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT] = "supplicant-disconnect",
[NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED] = "supplicant-config-failed",
[NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED] = "supplicant-failed",
[NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT] = "supplicant-timeout",
[NM_DEVICE_STATE_REASON_PPP_START_FAILED] = "ppp-start-failed",
[NM_DEVICE_STATE_REASON_PPP_DISCONNECT] = "ppp-disconnect",
[NM_DEVICE_STATE_REASON_PPP_FAILED] = "ppp-failed",
[NM_DEVICE_STATE_REASON_DHCP_START_FAILED] = "dhcp-start-failed",
[NM_DEVICE_STATE_REASON_DHCP_ERROR] = "dhcp-error",
[NM_DEVICE_STATE_REASON_DHCP_FAILED] = "dhcp-failed",
[NM_DEVICE_STATE_REASON_SHARED_START_FAILED] = "sharing-start-failed",
[NM_DEVICE_STATE_REASON_SHARED_FAILED] = "sharing-failed",
[NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED] = "autoip-start-failed",
[NM_DEVICE_STATE_REASON_AUTOIP_ERROR] = "autoip-error",
[NM_DEVICE_STATE_REASON_AUTOIP_FAILED] = "autoip-failed",
[NM_DEVICE_STATE_REASON_MODEM_BUSY] = "modem-busy",
[NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE] = "modem-no-dialtone",
[NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER] = "modem-no-carrier",
[NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT] = "modem-dial-timeout",
[NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED] = "modem-dial-failed",
[NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED] = "modem-init-failed",
[NM_DEVICE_STATE_REASON_GSM_APN_FAILED] = "gsm-apn-failed",
[NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING] = "gsm-registration-idle",
[NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED] = "gsm-registration-denied",
[NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT] = "gsm-registration-timeout",
[NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED] = "gsm-registration-failed",
[NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED] = "gsm-pin-check-failed",
[NM_DEVICE_STATE_REASON_FIRMWARE_MISSING] = "firmware-missing",
[NM_DEVICE_STATE_REASON_REMOVED] = "removed",
[NM_DEVICE_STATE_REASON_SLEEPING] = "sleeping",
[NM_DEVICE_STATE_REASON_CONNECTION_REMOVED] = "connection-removed",
[NM_DEVICE_STATE_REASON_USER_REQUESTED] = "user-requested",
[NM_DEVICE_STATE_REASON_CARRIER] = "carrier-changed",
[NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED] = "connection-assumed",
[NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE] = "supplicant-available",
[NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND] = "modem-not-found",
[NM_DEVICE_STATE_REASON_BT_FAILED] = "bluetooth-failed",
[NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED] = "gsm-sim-not-inserted",
[NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED] = "gsm-sim-pin-required",
[NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED] = "gsm-sim-puk-required",
[NM_DEVICE_STATE_REASON_GSM_SIM_WRONG] = "gsm-sim-wrong",
[NM_DEVICE_STATE_REASON_INFINIBAND_MODE] = "infiniband-mode",
[NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED] = "dependency-failed",
[NM_DEVICE_STATE_REASON_BR2684_FAILED] = "br2684-bridge-failed",
[NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE] = "modem-manager-unavailable",
[NM_DEVICE_STATE_REASON_SSID_NOT_FOUND] = "ssid-not-found",
[NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED] = "secondary-connection-failed",
[NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED] = "dcb-fcoe-failed",
[NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED] = "teamd-control-failed",
[NM_DEVICE_STATE_REASON_MODEM_FAILED] = "modem-failed",
[NM_DEVICE_STATE_REASON_MODEM_AVAILABLE] = "modem-available",
[NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT] = "sim-pin-incorrect",
[NM_DEVICE_STATE_REASON_NEW_ACTIVATION] = "new-activation",
[NM_DEVICE_STATE_REASON_PARENT_CHANGED] = "parent-changed",
[NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED] = "parent-managed-changed",
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_UNKNOWN, "unknown"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_NONE, "none"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_NOW_MANAGED, "managed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_NOW_UNMANAGED, "unmanaged"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_CONFIG_FAILED, "config-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE, "ip-config-unavailable"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED, "ip-config-expired"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_NO_SECRETS, "no-secrets"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT, "supplicant-disconnect"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED, "supplicant-config-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED, "supplicant-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT, "supplicant-timeout"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_PPP_START_FAILED, "ppp-start-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_PPP_DISCONNECT, "ppp-disconnect"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_PPP_FAILED, "ppp-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_DHCP_START_FAILED, "dhcp-start-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_DHCP_ERROR, "dhcp-error"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_DHCP_FAILED, "dhcp-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SHARED_START_FAILED, "sharing-start-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SHARED_FAILED, "sharing-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED, "autoip-start-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_AUTOIP_ERROR, "autoip-error"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_AUTOIP_FAILED, "autoip-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_BUSY, "modem-busy"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE, "modem-no-dialtone"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER, "modem-no-carrier"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT, "modem-dial-timeout"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED, "modem-dial-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED, "modem-init-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_APN_FAILED, "gsm-apn-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING, "gsm-registration-idle"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED, "gsm-registration-denied"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT, "gsm-registration-timeout"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED, "gsm-registration-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED, "gsm-pin-check-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_FIRMWARE_MISSING, "firmware-missing"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_REMOVED, "removed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SLEEPING, "sleeping"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_CONNECTION_REMOVED, "connection-removed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_USER_REQUESTED, "user-requested"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_CARRIER, "carrier-changed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED, "connection-assumed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE, "supplicant-available"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND, "modem-not-found"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_BT_FAILED, "bluetooth-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED, "gsm-sim-not-inserted"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED, "gsm-sim-pin-required"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED, "gsm-sim-puk-required"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_GSM_SIM_WRONG, "gsm-sim-wrong"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_INFINIBAND_MODE, "infiniband-mode"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED, "dependency-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_BR2684_FAILED, "br2684-bridge-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE, "modem-manager-unavailable"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SSID_NOT_FOUND, "ssid-not-found"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED, "secondary-connection-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED, "dcb-fcoe-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED, "teamd-control-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_FAILED, "modem-failed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_MODEM_AVAILABLE, "modem-available"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT, "sim-pin-incorrect"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_NEW_ACTIVATION, "new-activation"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_PARENT_CHANGED, "parent-changed"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED, "parent-managed-changed"),
);
#define reason_to_string(reason) \

10
src/nm-active-connection.c
View file

@ -122,11 +122,11 @@ static void _device_cleanup (NMActiveConnection *self);
/****************************************************************/
NM_UTILS_STRING_LOOKUP_TABLE_DEFINE_STATIC (_state_to_string, NMActiveConnectionState, NULL,
[NM_ACTIVE_CONNECTION_STATE_UNKNOWN] = "unknown",
[NM_ACTIVE_CONNECTION_STATE_ACTIVATING] = "activating",
[NM_ACTIVE_CONNECTION_STATE_ACTIVATED] = "activated",
[NM_ACTIVE_CONNECTION_STATE_DEACTIVATING] = "deactivating",
[NM_ACTIVE_CONNECTION_STATE_DEACTIVATED] = "deactivated",
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_ACTIVE_CONNECTION_STATE_UNKNOWN, "unknown"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_ACTIVE_CONNECTION_STATE_ACTIVATING, "activating"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_ACTIVE_CONNECTION_STATE_ACTIVATED, "activated"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, "deactivating"),
NM_UTILS_STRING_LOOKUP_TABLE_ITEM_S (NM_ACTIVE_CONNECTION_STATE_DEACTIVATED, "deactivated"),
);
#define state_to_string(state) NM_UTILS_STRING_LOOKUP_TABLE (_state_to_string, state)