Fix some getters

Just return const string(empty string) instead of modifying handle.

Change-Id: Iea592afea9bb5e7f73af0392ef9d33dcf76c1452
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/src/pkgmgrinfo_appinfo.c b/src/pkgmgrinfo_appinfo.c
index 916e338..b6d22b2 100644 (file)
--- a/src/pkgmgrinfo_appinfo.c
+++ b/src/pkgmgrinfo_appinfo.c
@@ -1605,8 +1605,9 @@ API int pkgmgrinfo_appinfo_get_metadata_value(pkgmgrinfo_appinfo_h handle, const
                if (metadata && metadata->key) {
                        if (strcasecmp(metadata->key, metadata_key) == 0) {
                                if (metadata->value == NULL)
-                                       metadata->value = strdup("");
-                               *metadata_value = (char*)metadata->value;
+                                       *metadata_value = "";
+                               else
+                                       *metadata_value = (char*)metadata->value;
                                return PMINFO_R_OK;
                        }
                }
@@ -1925,13 +1926,16 @@ API int pkgmgrinfo_appinfo_get_effectimage(pkgmgrinfo_appinfo_h handle, char **p
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
+
        if (info->app_info->portraitimg == NULL)
-               info->app_info->portraitimg = strdup("");
-       if (info->app_info->landscapeimg == NULL)
-               info->app_info->landscapeimg = strdup("");
+               *portrait_img = "";
+       else
+               *portrait_img = (char *)info->app_info->portraitimg;
 
-       *portrait_img = (char *)info->app_info->portraitimg;
-       *landscape_img = (char *)info->app_info->landscapeimg;
+       if (info->app_info->landscapeimg == NULL)
+               *landscape_img = "";
+       else
+               *landscape_img = (char *)info->app_info->landscapeimg;
 
        return PMINFO_R_OK;
 }
@@ -1962,10 +1966,11 @@ API int pkgmgrinfo_appinfo_get_submode_mainid(pkgmgrinfo_appinfo_h  handle, char
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->app_info->submode_mainid == NULL)
-               info->app_info->submode_mainid = strdup("");
 
-       *submode_mainid = (char *)info->app_info->submode_mainid;
+       if (info->app_info->submode_mainid == NULL)
+               *submode_mainid = "";
+       else
+               *submode_mainid = (char *)info->app_info->submode_mainid;
 
        return PMINFO_R_OK;
 }
@@ -2032,10 +2037,11 @@ API int pkgmgrinfo_appinfo_get_effective_appid(pkgmgrinfo_appinfo_h handle, char
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->app_info->effective_appid == NULL)
-               info->app_info->effective_appid = strdup("");
 
-       *effective_appid = (char *)info->app_info->effective_appid;
+       if (info->app_info->effective_appid == NULL)
+               *effective_appid = "";
+       else
+               *effective_appid = (char *)info->app_info->effective_appid;
 
        return PMINFO_R_OK;
 }
@@ -2051,10 +2057,11 @@ API int pkgmgrinfo_appinfo_get_tep_name(pkgmgrinfo_appinfo_h handle, char **tep_
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->app_info->tep_name == NULL)
-               info->app_info->tep_name = strdup("");
 
-       *tep_name = (char *)info->app_info->tep_name;
+       if (info->app_info->tep_name == NULL)
+               *tep_name = "";
+       else
+               *tep_name = (char *)info->app_info->tep_name;
 
        return PMINFO_R_OK;
 }
@@ -2070,10 +2077,11 @@ API int pkgmgrinfo_appinfo_get_zip_mount_file(pkgmgrinfo_appinfo_h handle, char
 
        if (info->app_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->app_info->zip_mount_file == NULL)
-               info->app_info->zip_mount_file = strdup("");
 
-       *zip_mount_file = (char *)info->app_info->zip_mount_file;
+       if (info->app_info->zip_mount_file == NULL)
+               *zip_mount_file = "";
+       else
+               *zip_mount_file = (char *)info->app_info->zip_mount_file;
 
        return PMINFO_R_OK;
 }
@@ -2265,9 +2273,7 @@ API int pkgmgrinfo_appinfo_foreach_metadata(pkgmgrinfo_appinfo_h handle,
                if (ptr == NULL)
                        continue;
                if (ptr->key) {
-                       if (ptr->value == NULL)
-                               ptr->value = strdup("");
-                       ret = metadata_func(ptr->key, ptr->value, user_data);
+                       ret = metadata_func(ptr->key, ptr->value ? ptr->value : "", user_data);
                        if (ret < 0)
                                break;
                }

diff --git a/src/pkgmgrinfo_pkginfo.c b/src/pkgmgrinfo_pkginfo.c
index 203dbd2..122538c 100644 (file)
--- a/src/pkgmgrinfo_pkginfo.c
+++ b/src/pkgmgrinfo_pkginfo.c
@@ -735,10 +735,11 @@ API int pkgmgrinfo_pkginfo_get_type(pkgmgrinfo_pkginfo_h handle, char **type)
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->type == NULL)
-               info->pkg_info->type = strdup("");
 
-       *type = (char *)info->pkg_info->type;
+       if (info->pkg_info->type == NULL)
+               *type = "";
+       else
+               *type = (char *)info->pkg_info->type;
 
        return PMINFO_R_OK;
 }
@@ -752,10 +753,11 @@ API int pkgmgrinfo_pkginfo_get_version(pkgmgrinfo_pkginfo_h handle, char **versi
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->version == NULL)
-               info->pkg_info->version = strdup("");
 
-       *version = (char *)info->pkg_info->version;
+       if (info->pkg_info->version == NULL)
+               *version = "";
+       else
+               *version = (char *)info->pkg_info->version;
 
        return PMINFO_R_OK;
 }
@@ -769,10 +771,11 @@ API int pkgmgrinfo_pkginfo_get_api_version(pkgmgrinfo_pkginfo_h handle, char **a
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->api_version == NULL)
-               info->pkg_info->api_version = strdup("");
 
-       *api_version = (char *)info->pkg_info->api_version;
+       if (info->pkg_info->api_version == NULL)
+               *api_version = "";
+       else
+               *api_version = (char *)info->pkg_info->api_version;
 
        return PMINFO_R_OK;
 }
@@ -801,10 +804,11 @@ API int pkgmgrinfo_pkginfo_get_zip_mount_file(pkgmgrinfo_pkginfo_h handle, char
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->zip_mount_file == NULL)
-               info->pkg_info->zip_mount_file = strdup("");
 
-       *zip_mount_file = (char *)info->pkg_info->zip_mount_file;
+       if (info->pkg_info->zip_mount_file == NULL)
+               *zip_mount_file = "";
+       else
+               *zip_mount_file = (char *)info->pkg_info->zip_mount_file;
 
        return PMINFO_R_OK;
 }
@@ -917,10 +921,13 @@ API int pkgmgrinfo_pkginfo_get_description(pkgmgrinfo_pkginfo_h handle, char **d
                return PMINFO_R_ERROR;
 
        ptr = (description_x *)info->pkg_info->description->data;
-       if (ptr == NULL || ptr->text == NULL)
-               *description = "";
+       if (ptr == NULL)
+               return PMINFO_R_ERROR;
 
-       *description = (char *)ptr->text;
+       if (ptr->text == NULL)
+               *description = "";
+       else
+               *description = (char *)ptr->text;
 
        return PMINFO_R_OK;
 }
@@ -939,10 +946,11 @@ API int pkgmgrinfo_pkginfo_get_author_name(pkgmgrinfo_pkginfo_h handle, char **a
        author = (author_x *)info->pkg_info->author->data;
        if (author == NULL)
                return PMINFO_R_ERROR;
-       if (author->text == NULL)
-               author->text = strdup("");
 
-       *author_name = (char *)author->text;
+       if (author->text == NULL)
+               *author_name = "";
+       else
+               *author_name = (char *)author->text;
 
        return PMINFO_R_OK;
 }
@@ -961,10 +969,11 @@ API int pkgmgrinfo_pkginfo_get_author_email(pkgmgrinfo_pkginfo_h handle, char **
        author = (author_x *)info->pkg_info->author->data;
        if (author == NULL)
                return PMINFO_R_ERROR;
-       if (author->email == NULL)
-               author->email = strdup("");
 
-       *author_email = (char *)author->email;
+       if (author->email == NULL)
+               *author_email = "";
+       else
+               *author_email = (char *)author->email;
 
        return PMINFO_R_OK;
 }
@@ -983,10 +992,11 @@ API int pkgmgrinfo_pkginfo_get_author_href(pkgmgrinfo_pkginfo_h handle, char **a
        author = (author_x *)info->pkg_info->author->data;
        if (author == NULL)
                return PMINFO_R_ERROR;
-       if (author->href == NULL)
-               author->href = strdup("");
 
-       *author_href = (char *)author->href;
+       if (author->href == NULL)
+               *author_href = "";
+       else
+               *author_href = (char *)author->href;
 
        return PMINFO_R_OK;
 }
@@ -1035,10 +1045,11 @@ API int pkgmgrinfo_pkginfo_get_storeclientid(pkgmgrinfo_pkginfo_h handle, char *
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->storeclient_id == NULL)
-               info->pkg_info->storeclient_id = strdup("");
 
-       *storeclientid = (char *)info->pkg_info->storeclient_id;
+       if (info->pkg_info->storeclient_id == NULL)
+               *storeclientid = "";
+       else
+               *storeclientid = (char *)info->pkg_info->storeclient_id;
 
        return PMINFO_R_OK;
 }
@@ -1067,10 +1078,11 @@ API int pkgmgrinfo_pkginfo_get_url(pkgmgrinfo_pkginfo_h handle, char **url)
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->package_url == NULL)
-               info->pkg_info->package_url = strdup("");
 
-       *url = (char *)info->pkg_info->package_url;
+       if (info->pkg_info->package_url == NULL)
+               *url = "";
+       else
+               *url = (char *)info->pkg_info->package_url;
 
        return PMINFO_R_OK;
 }
@@ -1099,10 +1111,11 @@ API int pkgmgrinfo_pkginfo_get_csc_path(pkgmgrinfo_pkginfo_h handle, char **path
 
        if (info->pkg_info == NULL)
                return PMINFO_R_ERROR;
-       if (info->pkg_info->csc_path == NULL)
-               info->pkg_info->csc_path = strdup("");
 
-       *path = (char *)info->pkg_info->csc_path;
+       if (info->pkg_info->csc_path == NULL)
+               *path = "";
+       else
+               *path = (char *)info->pkg_info->csc_path;
 
        return PMINFO_R_OK;
 }