Fix svace issue (Unreachable code)
[apps/native/ug-mobile-ap.git] / src / mh_view_main.c
index fcddfaf..d9805dd 100755 (executable)
@@ -33,8 +33,6 @@ static void __ctx_delete_more_ctxpopup_cb(void *data, Evas *e, Evas_Object *obj,
 static void __create_ctxpopup_more_button(void *data, Evas_Object *obj,
                                          void *event_info);
 
-static Eina_Bool rotate_flag = EINA_FALSE;
-
 void _genlist_update_device_item(mh_appdata_t *ad);
 mh_appdata_t *g_ad = NULL;
 #define UPDATE_INTERVAL 1
@@ -1070,9 +1068,9 @@ static char *__get_help_label(void *data, Evas_Object *obj, const char *part)
 {
        mh_appdata_t *ad = (mh_appdata_t *)data;
        char buf[MH_LABEL_LENGTH_MAX] = {0, };
-       char device_name[MH_LABEL_LENGTH_MAX] = {0, };
-       char passphrase[MH_LABEL_LENGTH_MAX] = {0, };
-       char security_type[MH_LABEL_LENGTH_MAX] = {0, };
+       char device_name[DEVICE_NAME_LENGTH_MAX] = {0, };
+       char passphrase[WIFI_PASSPHRASE_LENGTH_MAX] = {0, };
+       char security_type[SECURITY_TYPE_LENGTH_MAX] = {0, };
        char *fmt = STR_SECURITY_TYPE_PS;
        char *hidden = "";
        char *ptr = NULL;
@@ -1138,7 +1136,7 @@ static char *__get_help_label(void *data, Evas_Object *obj, const char *part)
                                        passphrase,
                                        security_type,
                                        STR_ENTER_THE_PASSWORD_ON_THE_OTHER_DEVICE,
-                                       hidden[0] != '\0' ? "<br>" : "",
+                                       hidden && hidden[0] != '\0' ? "<br>" : "",
                                        hidden);
                } else {
                        snprintf(buf, MH_LABEL_LENGTH_MAX,
@@ -1148,7 +1146,7 @@ static char *__get_help_label(void *data, Evas_Object *obj, const char *part)
                                        "</font_size>",
                                        STR_DEV_NAME,
                                        device_name,
-                                       hidden[0] != '\0' ? "<br>" : "",
+                                       hidden && hidden[0] != '\0' ? "<br>" : "",
                                        hidden);
                }
 
@@ -1572,15 +1570,9 @@ static void __dismissed_more_ctxpopup_cb(void *data, Evas_Object *obj, void *eve
 
        mh_appdata_t *ad = (mh_appdata_t *)data;
        Evas_Object *ctx = ad->ctxpopup;
+       evas_object_del(ctx);
+       ctx = NULL;
 
-       if (!rotate_flag) {
-               evas_object_del(ctx);
-               ctx = NULL;
-       } else {
-               __ctx_move_more_ctxpopup(ctx, ad);
-               evas_object_show(ctx);
-               rotate_flag = EINA_FALSE;
-       }
        __MOBILE_AP_FUNC_EXIT__;
 }