[PATCH 2/5] voicecall,common: promote call_status_to_string() public

[Alexander Couzens]

call_status_to_string() is useful for debug output.
Change signature to contain enum call_status
Replace default case to get compiler warning when new enums added
---
 src/common.c    | 21 +++++++++++++++++++++
 src/common.h    |  1 +
 src/voicecall.c | 24 ++----------------------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/common.c b/src/common.c
index 75bb94dc..6cfd7c92 100644
--- a/src/common.c
+++ b/src/common.c
@@ -750,3 +750,24 @@ gint ofono_call_compare(gconstpointer a, gconstpointer b)
 
        return 0;
 }
+
+const char *ofono_call_status_to_string(enum call_status status)
+{
+       switch (status) {
+       case CALL_STATUS_ACTIVE:
+               return "active";
+       case CALL_STATUS_HELD:
+               return "held";
+       case CALL_STATUS_DIALING:
+               return "dialing";
+       case CALL_STATUS_ALERTING:
+               return "alerting";
+       case CALL_STATUS_INCOMING:
+               return "incoming";
+       case CALL_STATUS_WAITING:
+               return "waiting";
+       case CALL_STATUS_DISCONNECTED:
+               return "disconnected";
+       }
+       return "unknown";
+}
diff --git a/src/common.h b/src/common.h
index 46bae577..6cb2b521 100644
--- a/src/common.h
+++ b/src/common.h
@@ -186,3 +186,4 @@ const char *packet_bearer_to_string(int bearer);
 gboolean is_valid_apn(const char *apn);
 
 gint ofono_call_compare(gconstpointer a, gconstpointer b);
+const char *ofono_call_status_to_string(enum call_status status);
diff --git a/src/voicecall.c b/src/voicecall.c
index 6907b502..c99f11fa 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -174,26 +174,6 @@ static const char *disconnect_reason_to_string(enum 
ofono_disconnect_reason r)
        }
 }
 
-static const char *call_status_to_string(int status)
-{
-       switch (status) {
-       case CALL_STATUS_ACTIVE:
-               return "active";
-       case CALL_STATUS_HELD:
-               return "held";
-       case CALL_STATUS_DIALING:
-               return "dialing";
-       case CALL_STATUS_ALERTING:
-               return "alerting";
-       case CALL_STATUS_INCOMING:
-               return "incoming";
-       case CALL_STATUS_WAITING:
-               return "waiting";
-       default:
-               return "disconnected";
-       }
-}
-
 static const char *phone_and_clip_to_string(const struct ofono_phone_number *n,
                                                int clip_validity)
 {
@@ -421,7 +401,7 @@ static void append_voicecall_properties(struct voicecall *v,
        ofono_bool_t mpty;
        dbus_bool_t emergency_call;
 
-       status = call_status_to_string(call->status);
+       status = ofono_call_status_to_string(call->status);
 
        ofono_dbus_dict_append(dict, "State", DBUS_TYPE_STRING, &status);
 
@@ -920,7 +900,7 @@ static void voicecall_set_call_status(struct voicecall 
*call, int status)
 
        call->call->status = status;
 
-       status_str = call_status_to_string(status);
+       status_str = ofono_call_status_to_string(status);
        path = voicecall_build_path(call->vc, call->call);
 
        ofono_dbus_signal_property_changed(conn, path,
-- 
2.13.3

_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono