Refactor: Move network registration status utils

Move the status to string functions to common.c so that they can be
reused in data connection related network registration code.

3 files changed, 47 insertions, 44 deletions

diff --git a/src/common.c b/src/common.c
index b62e34c7..1b002bf9 100644
--- a/src/common.c
+++ b/src/common.c
@@ -597,3 +597,47 @@ gboolean is_valid_pin(const char *pin)
 
 	return TRUE;
 }
+
+const char *registration_status_to_string(int status)
+{
+	switch (status) {
+	case NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
+		return "unregistered";
+	case NETWORK_REGISTRATION_STATUS_REGISTERED:
+		return "registered";
+	case NETWORK_REGISTRATION_STATUS_SEARCHING:
+		return "searching";
+	case NETWORK_REGISTRATION_STATUS_DENIED:
+		return "denied";
+	case NETWORK_REGISTRATION_STATUS_UNKNOWN:
+		return "unknown";
+	case NETWORK_REGISTRATION_STATUS_ROAMING:
+		return "roaming";
+	}
+
+	return "";
+}
+
+const char *registration_tech_to_string(int tech)
+{
+	switch (tech) {
+	case ACCESS_TECHNOLOGY_GSM:
+		return "GSM";
+	case ACCESS_TECHNOLOGY_GSM_COMPACT:
+		return "GSMCompact";
+	case ACCESS_TECHNOLOGY_UTRAN:
+		return "UTRAN";
+	case ACCESS_TECHNOLOGY_GSM_EGPRS:
+		return "GSM+EGPRS";
+	case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
+		return "UTRAN+HSDPA";
+	case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
+		return "UTRAN+HSUPA";
+	case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
+		return "UTRAN+HSDPA+HSUPA";
+	case ACCESS_TECHNOLOGY_EUTRAN:
+		return "EUTRAN";
+	default:
+		return "";
+	}
+}
diff --git a/src/common.h b/src/common.h
index 3805e216..1a5c9ed9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -135,3 +135,6 @@ const char *ss_control_type_to_string(enum ss_control_type type);
 const char *bearer_class_to_string(enum bearer_class cls);
 
 gboolean is_valid_pin(const char *pin);
+
+const char *registration_status_to_string(int status);
+const char *registration_tech_to_string(int tech);
diff --git a/src/network.c b/src/network.c
index 0e5d55b4..efa0bc7a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -117,50 +117,6 @@ static inline const char *network_operator_status_to_string(int status)
 	return "unknown";
 }
 
-static inline const char *registration_status_to_string(int status)
-{
-	switch (status) {
-	case NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
-		return "unregistered";
-	case NETWORK_REGISTRATION_STATUS_REGISTERED:
-		return "registered";
-	case NETWORK_REGISTRATION_STATUS_SEARCHING:
-		return "searching";
-	case NETWORK_REGISTRATION_STATUS_DENIED:
-		return "denied";
-	case NETWORK_REGISTRATION_STATUS_UNKNOWN:
-		return "unknown";
-	case NETWORK_REGISTRATION_STATUS_ROAMING:
-		return "roaming";
-	}
-
-	return "";
-}
-
-static inline const char *registration_tech_to_string(int tech)
-{
-	switch (tech) {
-	case ACCESS_TECHNOLOGY_GSM:
-		return "GSM";
-	case ACCESS_TECHNOLOGY_GSM_COMPACT:
-		return "GSMCompact";
-	case ACCESS_TECHNOLOGY_UTRAN:
-		return "UTRAN";
-	case ACCESS_TECHNOLOGY_GSM_EGPRS:
-		return "GSM+EGPRS";
-	case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
-		return "UTRAN+HSDPA";
-	case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
-		return "UTRAN+HSUPA";
-	case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
-		return "UTRAN+HSDPA+HSUPA";
-	case ACCESS_TECHNOLOGY_EUTRAN:
-		return "EUTRAN";
-	default:
-		return "";
-	}
-}
-
 static void register_callback(const struct ofono_error *error, void *data)
 {
 	struct ofono_netreg *netreg = data;