connectivity: refactor converting connectivity states to string

3 files changed, 8 insertions, 8 deletions

diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 204044d024..62db360af4 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -69,8 +69,8 @@ nm_connectivity_get_state (NMConnectivity *connectivity)
 	return NM_CONNECTIVITY_GET_PRIVATE (connectivity)->state;
 }
 
-static const char *
-state_name (NMConnectivityState state)
+const char *
+nm_connectivity_state_to_string (NMConnectivityState state)
 {
 	switch (state) {
 	case NM_CONNECTIVITY_UNKNOWN:
@@ -84,7 +84,7 @@ state_name (NMConnectivityState state)
 	case NM_CONNECTIVITY_FULL:
 		return "FULL";
 	default:
-		return "???";
+		g_return_val_if_reached ("???");
 	}
 }
 
@@ -95,7 +95,8 @@ update_state (NMConnectivity *self, NMConnectivityState state)
 
 	if (priv->state != state) {
 		nm_log_dbg (LOGD_CONCHECK, "Connectivity state changed from %s to %s",
-		            state_name (priv->state), state_name (state));
+		            nm_connectivity_state_to_string (priv->state),
+		            nm_connectivity_state_to_string (state));
 		priv->state = state;
 		g_object_notify (G_OBJECT (self), NM_CONNECTIVITY_STATE);
 	}
diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 771abdc237..a61af5c190 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -51,6 +51,8 @@ typedef struct {
 
 GType nm_connectivity_get_type (void);
 
+const char *nm_connectivity_state_to_string (NMConnectivityState state);
+
 NMConnectivity      *nm_connectivity_new          (void);
 
 void                 nm_connectivity_set_online   (NMConnectivity       *self,
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 0d0686319c..4ef0722644 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4274,12 +4274,9 @@ connectivity_changed (NMConnectivity *connectivity,
                       gpointer user_data)
 {
 	NMManager *self = NM_MANAGER (user_data);
-	NMConnectivityState state;
-	static const char *connectivity_states[] = { "UNKNOWN", "NONE", "PORTAL", "LIMITED", "FULL" };
 
-	state = nm_connectivity_get_state (connectivity);
 	nm_log_dbg (LOGD_CORE, "connectivity checking indicates %s",
-	            connectivity_states[state]);
+	            nm_connectivity_state_to_string (nm_connectivity_get_state (connectivity)));
 
 	nm_manager_update_state (self);
 	g_object_notify (G_OBJECT (self), NM_MANAGER_CONNECTIVITY);