fix check patch issues 35/52035/1
authorMinkyu Kang <mk7.kang@samsung.com>
Wed, 18 Nov 2015 10:48:05 +0000 (19:48 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 18 Nov 2015 10:48:05 +0000 (19:48 +0900)
Change-Id: Ic9373c5d62251682c808f500e568e117724a5c16
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
src/grid/grid_gallery.c
src/view/action_menu.c
src/view/base.c

index 8ea9d6d..23d69d3 100644 (file)
@@ -124,27 +124,24 @@ static char *_place_text_get(void *data, Evas_Object *obj, const char *part)
 
        gi = data;
 
+       snprintf(buf, sizeof(buf), "%s", gi->name);
+       city = strtok_r(buf, "/", &tmp);
+       country = strtok_r(tmp, "", &tmp);
+
        if (!strcmp(part, PART_ELM_TEXT_COUNT)) {
                cnt = eina_list_count(gi->list);
                snprintf(buf, sizeof(buf), "%d", cnt);
                return strdup(buf);
-       } else {
-               snprintf(buf, sizeof(buf), "%s", gi->name);
-
-               city = strtok_r(buf, "/", &tmp);
-               country = strtok_r(tmp, "", &tmp);
-
-               if (!strcmp(part, PART_ELM_TEXT_CITY)) {
-                       if (!city)
-                               return NULL;
+       } else if (!strcmp(part, PART_ELM_TEXT_CITY)) {
+               if (!city)
+                       return NULL;
 
-                       return strdup(city);
-               } else if (!strcmp(part, PART_ELM_TEXT_COUNTRY)) {
-                       if (!country)
-                               return NULL;
+               return strdup(city);
+       } else if (!strcmp(part, PART_ELM_TEXT_COUNTRY)) {
+               if (!country)
+                       return NULL;
 
-                       return strdup(country);
-               }
+               return strdup(country);
        }
 
        return NULL;
index cefee40..210d4f6 100644 (file)
@@ -656,7 +656,8 @@ static bool _draw_menu_area(struct _priv *priv)
                return false;
        }
 
-       elm_object_part_content_set(priv->content, PART_ACTION_MENU_AREA, table);
+       elm_object_part_content_set(priv->content,
+                       PART_ACTION_MENU_AREA, table);
 
        priv->table = table;
 
@@ -823,7 +824,8 @@ static void _update_favorite_area(struct _priv *priv)
 
        elm_gengrid_item_class_free(ic);
 
-       count = eina_list_count(priv->favorite_list) / content_info[type].grid_n;
+       count = eina_list_count(priv->favorite_list)
+               / content_info[type].grid_n;
        if (eina_list_count(priv->favorite_list) % content_info[type].grid_n)
                count++;
 
index 630925e..c48c22b 100644 (file)
@@ -40,7 +40,7 @@
 
 #define TIME_TOAST_FAVORITE 5.0
 
-#define ARRAY_SIZE(arr) (sizeof(arr)) / (sizeof((arr)[0]))
+#define ARRAY_SIZE(arr) (sizeof((arr)) / sizeof((arr)[0]))
 
 enum _object_type {
        BASE_MENU_BTN = 0,