diff options
author | Thomas Haller <thaller@redhat.com> | 2016-02-01 13:32:02 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-02-01 14:52:55 +0100 |
commit | f2879e1ba29202865d3bf792b73ea0841cd4ece1 (patch) | |
tree | 10619c6589e26a5fd6e3c7857171b2f21d9e16aa /src/nm-connectivity.c | |
parent | 174b25d98c3ae395f5b41fc2e7d5c222cb6369cf (diff) | |
download | NetworkManager-f2879e1ba29202865d3bf792b73ea0841cd4ece1.tar.gz |
connectivity: implement nm_connectivity_state_to_string() as NM_UTILS_LOOKUP_STR_DEFINE_WARN()
Diffstat (limited to 'src/nm-connectivity.c')
-rw-r--r-- | src/nm-connectivity.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index b738e7ad53..a2216ee9a8 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -29,6 +29,7 @@ #include "nm-default.h" #include "nm-connectivity.h" #include "nm-config.h" +#include "NetworkManagerUtils.h" G_DEFINE_TYPE (NMConnectivity, nm_connectivity, G_TYPE_OBJECT) @@ -76,24 +77,14 @@ nm_connectivity_get_state (NMConnectivity *connectivity) return NM_CONNECTIVITY_GET_PRIVATE (connectivity)->state; } -const char * -nm_connectivity_state_to_string (NMConnectivityState state) -{ - switch (state) { - case NM_CONNECTIVITY_UNKNOWN: - return "UNKNOWN"; - case NM_CONNECTIVITY_NONE: - return "NONE"; - case NM_CONNECTIVITY_LIMITED: - return "LIMITED"; - case NM_CONNECTIVITY_PORTAL: - return "PORTAL"; - case NM_CONNECTIVITY_FULL: - return "FULL"; - default: - g_return_val_if_reached ("???"); - } -} +NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_state_to_string, NMConnectivityState, + NM_UTILS_LOOKUP_DEFAULT_WARN ("???"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_UNKNOWN, "UNKNOWN"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_NONE, "NONE"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_LIMITED, "LIMITED"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_PORTAL, "PORTAL"), + NM_UTILS_LOOKUP_STR_ITEM (NM_CONNECTIVITY_FULL, "FULL"), +); static void update_state (NMConnectivity *self, NMConnectivityState state) |