[PATCH 4/4] Resolve Coverity issue.

This patch resolve following issue:
105106 110930 109825 106768 106588 106919

Change-Id: Ie9ca58a4ff84a075bd787c50b06477edc564e563

diff --git a/inc/add-viewer_ucol.h b/inc/add-viewer_ucol.h
index 39d2005ce45a197a6fbc318f8d87d836339e295c..e273e93731d4a542222020e867c10acf97592001 100644 (file)
--- a/inc/add-viewer_ucol.h
+++ b/inc/add-viewer_ucol.h
@@ -37,7 +37,7 @@ extern int add_viewer_ucol_case_search(const char *haystack, const char *needle)
 extern int add_viewer_ucol_compare_first_letters(const char *src, const char *letters);
 extern int add_viewer_ucol_detect_lang(int ch);
 extern int add_viewer_ucol_fini(void);
-extern const int add_viewer_ucol_current_lang(void);
+extern int add_viewer_ucol_current_lang(void);
 extern int add_viewer_ucol_is_alpha(const char *name);
 
 /* End of a file */

diff --git a/src/add-viewer.c b/src/add-viewer.c
index 7e0292f29a7c99176d5ca563c6d67ada0376d876..d22f67c0e2b011bb417fcfdb21764755fb383f5e 100755 (executable)
--- a/src/add-viewer.c
+++ b/src/add-viewer.c
@@ -115,6 +115,10 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
        char *name = NULL;
        char *appname = NULL;
        char *filter;
+       const char *widget_id = NULL;
+       int max_instance = 0;
+       int num_instance = 0;
+       int widget_count = 0;
 
        l = (Eina_List *)evas_object_data_get(container, "list");
        if (!l) {
@@ -136,7 +140,7 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
                goto out;
        }
 
-       const char *widget_id = add_viewer_package_list_pkgname(package);
+       widget_id = add_viewer_package_list_pkgname(package);
        if (widget_id) {
                if (!strcmp(widget_id, CALENDAR_NEXT_EVENT_WIDGET_ID)) {
                        if (util_host_vender_id_get() == W_HOME_VENDOR_ID_LO) {
@@ -149,8 +153,8 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
                        goto out;
        }
 
-       int max_instance = add_viewer_package_get_max_instance_count(package);
-       int num_instance = add_viewer_package_get_instance_count(package);
+       max_instance = add_viewer_package_get_max_instance_count(package);
+       num_instance = add_viewer_package_get_instance_count(package);
 
        DbgPrint("widget_id[%s] max_instance[%d] num_instance[%d]", widget_id,  max_instance, num_instance);
 
@@ -159,7 +163,7 @@ static Eina_Bool normal_loader_cb(struct widget_data *widget_data, void *contain
                goto out;
        }
 
-       int widget_count = add_viewer_package_get_widget_count_in_package(package);
+       widget_count = add_viewer_package_get_widget_count_in_package(package);
 
        filter = evas_object_data_get(container, "filter");
        if (filter) {

diff --git a/src/add-viewer_ucol.c b/src/add-viewer_ucol.c
index 6771e482d416ad5601c21c5af32f891b3232e4e9..1087f9ea1c382b29897ec7a443d7b2b9d9031bf8 100644 (file)
--- a/src/add-viewer_ucol.c
+++ b/src/add-viewer_ucol.c
@@ -760,8 +760,9 @@ HAPI int add_viewer_ucol_fini(void)
        return 0;
 }
 
-HAPI const int add_viewer_ucol_current_lang(void)
+HAPI int add_viewer_ucol_current_lang(void)
 {
+
        return s_info.lang;
 }