Simplify __net_telephony_get_profile_info by using functions dedicated to each task

Change-Id: I081521597d11337397c096fbb6b8dd487e3413fe
Signed-off-by: Cheoleun Moon <chleun.moon@samsung.com>

diff --git a/src/network-profile-intf.c b/src/network-profile-intf.c
index 4ff60f1..c79f379 100755 (executable)
--- a/src/network-profile-intf.c
+++ b/src/network-profile-intf.c
@@ -201,6 +201,137 @@ static int __net_telephony_init_profile_info(net_telephony_profile_info_t* ProfI
        return NET_ERR_NONE;
 }
 
+static void __net_telephony_get_path(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->ProfileName, value, NET_PROFILE_NAME_LEN_MAX);
+}
+
+static void __net_telephony_get_svc_ctg_id(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       net_service_type_t ServiceType = NET_SERVICE_UNKNOWN;
+
+       if (value != NULL)
+               ServiceType = atoi(value);
+
+       if (ServiceType > NET_SERVICE_UNKNOWN)
+               ProfileInfo->ServiceType = ServiceType;
+}
+
+static void __net_telephony_get_apn(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->Apn, value, NET_PDP_APN_LEN_MAX);
+}
+
+static void __net_telephony_get_pdp_protocol(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       net_pdn_type_e pdnType = NET_PDN_TYPE_UNKNOWN;
+
+       if (value != NULL)
+               pdnType = atoi(value);
+
+       if (pdnType == NET_PDN_TYPE_IPV4)
+               ProfileInfo->PdnType = NET_PDN_TYPE_IPV4;
+       else if (pdnType == NET_PDN_TYPE_IPV6)
+               ProfileInfo->PdnType = NET_PDN_TYPE_IPV6;
+       else if (pdnType == NET_PDN_TYPE_IPV4_IPV6)
+               ProfileInfo->PdnType = NET_PDN_TYPE_IPV4_IPV6;
+}
+
+static void __net_telephony_get_roam_pdp_protocol(const gchar *value,
+               net_telephony_profile_info_t *ProfileInfo)
+{
+       net_pdn_type_e roamPdnType = NET_PDN_TYPE_UNKNOWN;
+
+       if (value != NULL)
+               roamPdnType = atoi(value);
+
+       if (roamPdnType == NET_PDN_TYPE_IPV4)
+               ProfileInfo->RoamPdnType = NET_PDN_TYPE_IPV4;
+       else if (roamPdnType == NET_PDN_TYPE_IPV6)
+               ProfileInfo->RoamPdnType = NET_PDN_TYPE_IPV6;
+       else if (roamPdnType == NET_PDN_TYPE_IPV4_IPV6)
+               ProfileInfo->RoamPdnType = NET_PDN_TYPE_IPV4_IPV6;
+}
+
+static void __net_telephony_get_auth_type(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       net_auth_type_t authType = NET_PDP_AUTH_NONE;
+
+       if (value != NULL)
+               authType = atoi(value);
+
+       if (authType == NET_PDP_AUTH_PAP)
+               ProfileInfo->AuthInfo.AuthType = NET_PDP_AUTH_PAP;
+       else if (authType == NET_PDP_AUTH_CHAP)
+               ProfileInfo->AuthInfo.AuthType = NET_PDP_AUTH_CHAP;
+}
+
+static void __net_telephony_get_auth_id(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->AuthInfo.UserName, value, NET_PDP_AUTH_USERNAME_LEN_MAX);
+}
+
+static void __net_telephony_get_auth_pwd(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->AuthInfo.Password, value, NET_PDP_AUTH_PASSWORD_LEN_MAX);
+}
+
+static void __net_telephony_get_proxy_addr(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->ProxyAddr, value, NET_PROXY_LEN_MAX);
+}
+
+static void __net_telephony_get_home_uri(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->HomeURL, value, NET_HOME_URL_LEN_MAX);
+}
+
+static void __net_telephony_get_default_internet_conn(const gchar *value,
+               net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value == NULL)
+               return;
+
+       if (g_strcmp0(value, "TRUE") == 0)
+               ProfileInfo->DefaultConn = TRUE;
+       else
+               ProfileInfo->DefaultConn = FALSE;
+}
+
+static void __net_telephony_get_profile_name(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value != NULL)
+               g_strlcpy(ProfileInfo->Keyword, value, NET_PDP_APN_LEN_MAX);
+}
+
+static void __net_telephony_get_editable(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value == NULL)
+               return;
+
+       if (g_strcmp0(value, "TRUE") == 0)
+               ProfileInfo->Editable = TRUE;
+       else
+               ProfileInfo->Editable = FALSE;
+}
+
+static void __net_telephony_get_hidden(const gchar *value, net_telephony_profile_info_t *ProfileInfo)
+{
+       if (value == NULL)
+               return;
+
+       if (g_strcmp0(value, "TRUE") == 0)
+               ProfileInfo->Hidden = TRUE;
+       else
+               ProfileInfo->Hidden = FALSE;
+}
+
 static int __net_telephony_get_profile_info(net_profile_name_t* ProfileName, net_telephony_profile_info_t *ProfileInfo)
 {
        __NETWORK_FUNC_ENTER__;
@@ -236,92 +367,33 @@ static int __net_telephony_get_profile_info(net_profile_name_t* ProfileName, net
        g_variant_get(result, "(a{ss})", &iter);
        while (g_variant_iter_loop(iter, "{ss}", &key, &value)) {
                if (g_strcmp0(key, "path") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->ProfileName, value, NET_PROFILE_NAME_LEN_MAX);
+                       __net_telephony_get_path(value, ProfileInfo);
                } else if (g_strcmp0(key, "svc_ctg_id") == 0) {
-                       net_service_type_t ServiceType = NET_SERVICE_UNKNOWN;
-
-                       if (value != NULL)
-                               ServiceType = atoi(value);
-
-                       if (ServiceType > NET_SERVICE_UNKNOWN)
-                               ProfileInfo->ServiceType = ServiceType;
+                       __net_telephony_get_svc_ctg_id(value, ProfileInfo);
                } else if (g_strcmp0(key, "apn") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->Apn, value, NET_PDP_APN_LEN_MAX);
+                       __net_telephony_get_apn(value, ProfileInfo);
                } else if (g_strcmp0(key, "pdp_protocol") == 0) {
-                       net_pdn_type_e pdnType = NET_PDN_TYPE_UNKNOWN;
-
-                       if (value != NULL)
-                               pdnType = atoi(value);
-
-                       if (pdnType == NET_PDN_TYPE_IPV4)
-                               ProfileInfo->PdnType = NET_PDN_TYPE_IPV4;
-                       else if (pdnType == NET_PDN_TYPE_IPV6)
-                               ProfileInfo->PdnType = NET_PDN_TYPE_IPV6;
-                       else if (pdnType == NET_PDN_TYPE_IPV4_IPV6)
-                               ProfileInfo->PdnType = NET_PDN_TYPE_IPV4_IPV6;
+                       __net_telephony_get_pdp_protocol(value, ProfileInfo);
                } else if (g_strcmp0(key, "roam_pdp_protocol") == 0) {
-                       net_pdn_type_e roamPdnType = NET_PDN_TYPE_UNKNOWN;
-
-                       if (value != NULL)
-                               roamPdnType = atoi(value);
-
-                       if (roamPdnType == NET_PDN_TYPE_IPV4)
-                               ProfileInfo->RoamPdnType = NET_PDN_TYPE_IPV4;
-                       else if (roamPdnType == NET_PDN_TYPE_IPV6)
-                               ProfileInfo->RoamPdnType = NET_PDN_TYPE_IPV6;
-                       else if (roamPdnType == NET_PDN_TYPE_IPV4_IPV6)
-                               ProfileInfo->RoamPdnType = NET_PDN_TYPE_IPV4_IPV6;
+                       __net_telephony_get_roam_pdp_protocol(value, ProfileInfo);
                } else if (g_strcmp0(key, "auth_type") == 0) {
-                       net_auth_type_t authType = NET_PDP_AUTH_NONE;
-
-                       if (value != NULL)
-                               authType = atoi(value);
-
-                       if (authType == NET_PDP_AUTH_PAP)
-                               ProfileInfo->AuthInfo.AuthType = NET_PDP_AUTH_PAP;
-                       else if (authType == NET_PDP_AUTH_CHAP)
-                               ProfileInfo->AuthInfo.AuthType = NET_PDP_AUTH_CHAP;
+                       __net_telephony_get_auth_type(value, ProfileInfo);
                } else if (g_strcmp0(key, "auth_id") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->AuthInfo.UserName, value, NET_PDP_AUTH_USERNAME_LEN_MAX);
+                       __net_telephony_get_auth_id(value, ProfileInfo);
                } else if (g_strcmp0(key, "auth_pwd") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->AuthInfo.Password, value, NET_PDP_AUTH_PASSWORD_LEN_MAX);
+                       __net_telephony_get_auth_pwd(value, ProfileInfo);
                } else if (g_strcmp0(key, "proxy_addr") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->ProxyAddr, value, NET_PROXY_LEN_MAX);
+                       __net_telephony_get_proxy_addr(value, ProfileInfo);
                } else if (g_strcmp0(key, "home_url") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->HomeURL, value, NET_HOME_URL_LEN_MAX);
+                       __net_telephony_get_home_uri(value, ProfileInfo);
                } else if (g_strcmp0(key, "default_internet_conn") == 0) {
-                       if (value == NULL)
-                               continue;
-
-                       if (g_strcmp0(value, "TRUE") == 0)
-                               ProfileInfo->DefaultConn = TRUE;
-                       else
-                               ProfileInfo->DefaultConn = FALSE;
+                       __net_telephony_get_default_internet_conn(value, ProfileInfo);
                } else if (g_strcmp0(key, "profile_name") == 0) {
-                       if (value != NULL)
-                               g_strlcpy(ProfileInfo->Keyword, value, NET_PDP_APN_LEN_MAX);
+                       __net_telephony_get_profile_name(value, ProfileInfo);
                } else if (g_strcmp0(key, "editable") == 0) {
-                       if (value == NULL)
-                               continue;
-
-                       if (g_strcmp0(value, "TRUE") == 0)
-                               ProfileInfo->Editable = TRUE;
-                       else
-                               ProfileInfo->Editable = FALSE;
+                       __net_telephony_get_editable(value, ProfileInfo);
                } else if (g_strcmp0(key, "hidden") == 0) {
-                       if (value == NULL)
-                               continue;
-
-                       if (g_strcmp0(value, "TRUE") == 0)
-                               ProfileInfo->Hidden = TRUE;
-                       else
-                               ProfileInfo->Hidden = FALSE;
+                       __net_telephony_get_hidden(value, ProfileInfo);
                }
        }