Remove unused enum variables

[platform/core/appfw/pkgmgr-info.git] / src / pkgmgrinfo_pkginfo.c

diff --git a/src/pkgmgrinfo_pkginfo.c b/src/pkgmgrinfo_pkginfo.c
index f838d35..fe4b52a 100644 (file)
--- a/src/pkgmgrinfo_pkginfo.c
+++ b/src/pkgmgrinfo_pkginfo.c
@@ -86,6 +86,16 @@ static void __destroy_each_node(gpointer data, gpointer user_data)
        node = NULL;
 }
 
+static void __destroy_metadata_node(gpointer data)
+{
+       pkgmgrinfo_metadata_node_x *node = (pkgmgrinfo_metadata_node_x *)data;
+       if (node->key)
+               free(node->key);
+       if (node->value)
+               free(node->value);
+       free(node);
+}
+
 static void __cleanup_pkginfo(pkgmgr_pkginfo_x *data)
 {
        ret_if(data == NULL);
@@ -445,9 +455,8 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
                info = calloc(1, sizeof(package_x));
                if (info == NULL) {
                        LOGE("out of memory");
-                       sqlite3_finalize(stmt);
-                       sqlite3_close_v2(db);
-                       return PMINFO_R_ERROR;
+                       ret = PMINFO_R_ERROR;
+                       goto catch;
                }
                idx = 0;
                _save_column_str(stmt, idx++, &info->package);
@@ -455,6 +464,7 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
                                        (gconstpointer)info->package)) {
                        free(info->package);
                        free(info);
+                       info = NULL;
                        continue;
                }
                _save_column_str(stmt, idx++, &info->version);
@@ -488,10 +498,8 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
                        /* TODO : author should be retrieved at package_localized_info */
                        author = calloc(1, sizeof(author_x));
                        if (author == NULL) {
-                               pkgmgrinfo_basic_free_package(info);
-                               sqlite3_finalize(stmt);
-                               sqlite3_close_v2(db);
-                               return PMINFO_R_ERROR;
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
                        }
                        _save_column_str(stmt, idx++, &author->text);
                        _save_column_str(stmt, idx++, &author->email);
@@ -504,10 +512,8 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
                        _save_column_str(stmt, idx++, &tmp_record);
 
                        if (_add_label_info_into_list(locale, tmp_record, &info->label)) {
-                               pkgmgrinfo_basic_free_package(info);
-                               sqlite3_finalize(stmt);
-                               sqlite3_close_v2(db);
-                               return PMINFO_R_ERROR;
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
                        }
                }
 
@@ -515,10 +521,8 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
                        tmp_record = NULL;
                        _save_column_str(stmt, idx++, &tmp_record);
                        if (_add_icon_info_into_list(locale, tmp_record, &info->icon)) {
-                               pkgmgrinfo_basic_free_package(info);
-                               sqlite3_finalize(stmt);
-                               sqlite3_close_v2(db);
-                               return PMINFO_R_ERROR;
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
                        }
                }
 
@@ -527,20 +531,16 @@ static int _pkginfo_get_packages(uid_t uid, const char *locale,
                        _save_column_str(stmt, idx++, &tmp_record);
                        if (_pkginfo_add_description_info_into_list(locale, tmp_record,
                                        &info->description)) {
-                               pkgmgrinfo_basic_free_package(info);
-                               sqlite3_finalize(stmt);
-                               sqlite3_close_v2(db);
-                               return PMINFO_R_ERROR;
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
                        }
                }
 
                if (flag & PMINFO_PKGINFO_GET_PRIVILEGE) {
                        if (_pkginfo_get_privilege(db, info->package,
                                                &info->privileges)) {
-                               pkgmgrinfo_basic_free_package(info);
-                               sqlite3_finalize(stmt);
-                               sqlite3_close_v2(db);
-                               return PMINFO_R_ERROR;
+                               ret = PMINFO_R_ERROR;
+                               goto catch;
                        }
                }
 
@@ -605,6 +605,7 @@ static int _pkginfo_get_filtered_foreach_pkginfo(uid_t uid,
                ret = pkgmgrinfo_pkginfo_filter_create((void *)&tmp_filter);
                if (ret != PMINFO_R_OK) {
                        _LOGE("Failed to create filter");
+                       g_hash_table_destroy(list);
                        return PMINFO_R_ERROR;
                }
        }
@@ -1650,6 +1651,8 @@ API int pkgmgrinfo_pkginfo_filter_destroy(pkgmgrinfo_pkginfo_filter_h handle)
                g_slist_free(filter->list);
        }
 
+       g_slist_free_full(filter->list_metadata, __destroy_metadata_node);
+
        free(filter);
 
        return PMINFO_R_OK;
@@ -1822,6 +1825,7 @@ API int pkgmgrinfo_pkginfo_usr_filter_count(pkgmgrinfo_pkginfo_filter_h handle,
                                PMINFO_PKGINFO_PROP_PACKAGE_DISABLE, false);
                if (ret != PMINFO_R_OK) {
                        free(locale);
+                       g_hash_table_destroy(list);
                        return PMINFO_R_ERROR;
                }
        }
@@ -1932,7 +1936,7 @@ int __compare_package_version(const char *version, int *major,
        *major = atoi(major_str);
        *minor = atoi(minor_str);
        *macro = 0;
-       *minor = 0;
+       *nano = 0;
        macro_str = strtok_r(NULL, ".", &save_str);
        if (macro_str == NULL) {
                _LOGD("macro version is NULL");