Uncrustify eve

Exceptions:
 - auto-generated files by geneet (favorite.[ch] and history.[ch])

Config not used:
 - *_closebrace_comment in uncrustify config



SVN revision: 51682

src/bin/chrome.c

@@ -34,14 +34,16 @@ typedef enum {
    ITEM_TYPE_SEPARATOR,
 } Bookmark_Menu_Item_Type;
 
-struct _Bookmark_Menu_Item {
+struct _Bookmark_Menu_Item
+{
    Bookmark_Menu_Item_Type type;
    const char             *text;
    void                   *next;
    Eina_Bool               dynamic : 1;
 };
 
-struct _Bookmark_Menu_Filter_Context {
+struct _Bookmark_Menu_Filter_Context
+{
    Bookmark_Menu_Item *current_bookmark_item;
    double              time;
 };
@@ -74,7 +76,6 @@ static Bookmark_Menu_Item bookmark_menu_root[] =
    { ITEM_TYPE_LAST, NULL, NULL, EINA_FALSE }
 };
 
-
 static Eina_List *
 _eina_hash_sorted_keys_get(Eina_Hash *hash, Eina_Compare_Cb compare_func)
 {
@@ -93,6 +94,7 @@ _eina_hash_sorted_keys_get(Eina_Hash *hash, Eina_Compare_Cb compare_func)
 
    return keys;
 }
+
 static Bookmark_Menu_Item *
 _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, Eina_Bool (*filter)(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item))
 {
@@ -109,7 +111,8 @@ _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, E
    {
       Hist_Item *item = hist_items_get(hist, url);
 
-       if (!filter(&ctx, item)) continue;
+      if (!filter(&ctx, item))
+         continue;
 
       bm_item = calloc(1, sizeof(Bookmark_Menu_Item));
       bm_item->type = ITEM_TYPE_PAGE;
@@ -122,8 +125,10 @@ _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, E
       else if (n_items % BOOKMARK_MENU_PREALLOC_SIZE == 0)
         {
            new_ret = realloc(ret, (BOOKMARK_MENU_PREALLOC_SIZE * n_items * sizeof(*ret)));
-             if (new_ret) ret = new_ret;
+           if (new_ret)
-             else goto realloc_error;
+              ret = new_ret;
+           else
+              goto realloc_error;
         }
 
       memcpy(&ret[n_items], bm_item, sizeof(*ret));
@@ -134,7 +139,8 @@ _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, E
 
 realloc_error:
 
-   if (!n_items) return NULL;
+   if (!n_items)
+      return NULL;
 
    bm_item = calloc(1, sizeof(Bookmark_Menu_Item));
    bm_item->type = ITEM_TYPE_LAST;
@@ -145,6 +151,7 @@ realloc_error:
         free(ret);
         return NULL;
      }
+
    ret = new_ret;
    memcpy(&ret[n_items], bm_item, sizeof(*ret));
    free(bm_item);
@@ -162,6 +169,7 @@ _domain_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
         domain += 3;
         return !strncmp(domain, filtered_domain, strlen(filtered_domain));
      }
+
    return EINA_FALSE;
 }
 
@@ -192,15 +200,19 @@ bookmark_menu_history_by_domain(Bookmark_Menu_Item *current_item)
       char *urlcopy = strdup(url);
       char *domain, *end;
 
-       if ((domain = strcasestr(urlcopy, "http://"))) domain += 7;
+      if ((domain = strcasestr(urlcopy, "http://")))
-       else if ((domain = strcasestr(urlcopy, "https://"))) domain += 8;
+         domain += 7;
-       else goto unknown_schema;
+      else if ((domain = strcasestr(urlcopy, "https://")))
+         domain += 8;
+      else
+         goto unknown_schema;
 
       if ((end = strchr(domain, '/')))
         {
            *end = '\0';
            eina_hash_set(domains, strdup(domain), (void *)1);
         }
+
 unknown_schema:
       free(urlcopy);
    }
@@ -220,8 +232,10 @@ unknown_schema:
       else if (n_items % BOOKMARK_MENU_PREALLOC_SIZE == 0)
         {
            new_ret = realloc(ret, (BOOKMARK_MENU_PREALLOC_SIZE * n_items * sizeof(*ret)));
-             if (new_ret) ret = new_ret;
+           if (new_ret)
-             else goto realloc_error;
+              ret = new_ret;
+           else
+              goto realloc_error;
         }
 
       memcpy(&ret[n_items], bm_item, sizeof(*ret));
@@ -233,7 +247,8 @@ realloc_error:
    eina_iterator_free(items);
    eina_hash_free(domains);
 
-   if (!n_items) return NULL;
+   if (!n_items)
+      return NULL;
 
    bm_item = calloc(1, sizeof(Bookmark_Menu_Item));
    bm_item->type = ITEM_TYPE_LAST;
@@ -244,6 +259,7 @@ realloc_error:
         free(ret);
         return NULL;
      }
+
    ret = new_ret;
    memcpy(&ret[n_items], bm_item, sizeof(*ret));
    free(bm_item);
@@ -267,7 +283,6 @@ _today_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
    return (now - item_time) <= 24 * 3600;
 }
 
-
 static Eina_Bool
 _yesterday_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
 {
@@ -367,8 +382,10 @@ bookmark_menu_favorites(Bookmark_Menu_Item *current_item)
       else if (n_items % BOOKMARK_MENU_PREALLOC_SIZE == 0)
         {
            new_ret = realloc(ret, (BOOKMARK_MENU_PREALLOC_SIZE * n_items * sizeof(*ret)));
-             if (new_ret) ret = new_ret;
+           if (new_ret)
-             else goto realloc_error;
+              ret = new_ret;
+           else
+              goto realloc_error;
         }
 
       memcpy(&ret[n_items], bm_item, sizeof(*ret));
@@ -394,6 +411,7 @@ realloc_error:
         free(ret);
         return NULL;
      }
+
    ret = new_ret;
    memcpy(&ret[n_items], bm_item, sizeof(*ret));
    free(bm_item);
@@ -444,7 +462,8 @@ on_fav_off(void *data, Evas_Object * o __UNUSED__,
    Evas_Object *view = data;
    const char *url = ewk_view_uri_get(view);
 
-   if (url) fav_items_del(fav, url);
+   if (url)
+      fav_items_del(fav, url);
 }
 
 static void
@@ -467,7 +486,8 @@ _history_update(const char *url, const char *title)
 {
    Hist_Item *item;
 
-   if (!url) return;
+   if (!url)
+      return;
 
    if ((item = hist_items_get(hist, url)))
      {
@@ -489,6 +509,7 @@ _chrome_state_apply(Evas_Object * chrome, Evas_Object * view)
 
    if (!title)
       title = url;
+
    edje_object_part_text_set(ed, "text.title", title ? title : "");
 
    text_url = edje_object_part_swallow_get(ed, "url-entry");
@@ -623,6 +644,7 @@ _popup_item_selected(void *data, Evas_Object * obj, void *event_info)
    {
       if (d == it)
          break;
+
       i++;
    }
 
@@ -781,6 +803,7 @@ on_bookmark_item_back_click(void *data, Evas_Object *edje,
         eina_stringshare_del(bmi->text);
         free(bmi);
      }
+
    win->list_history = eina_list_remove_list(win->list_history, win->list_history);
    win->list_history_titles = eina_list_remove_list(win->list_history_titles, win->list_history_titles);
 
@@ -800,7 +823,8 @@ on_bookmark_item_click(void *data, Evas_Object * obj,
    Browser_Window *win = evas_object_data_get(chrome, "win");
    const char *old_text = edje_object_part_text_get(ed, "bookmark-list-title");
 
-   if (!bmi) return;
+   if (!bmi)
+      return;
 
    switch (bmi->type) {
       case ITEM_TYPE_STATIC_FOLDER:
@@ -809,10 +833,13 @@ on_bookmark_item_click(void *data, Evas_Object * obj,
          edje_object_part_text_set(ed, "bookmark-list-title", bmi->text);
          bookmark_menu_set(chrome, obj, bmi->next, old_text);
          break;
+
       case ITEM_TYPE_DYNAMIC_FOLDER:
       {
          Bookmark_Menu_Callback callback = bmi->next;
-         if (!callback) return;
+         if (!callback)
+            return;
+
          Bookmark_Menu_Item *new_root = callback(bmi);
          if (new_root)
            {
@@ -823,22 +850,29 @@ on_bookmark_item_click(void *data, Evas_Object * obj,
            }
       }
       break;
+
       case ITEM_TYPE_LAST:
       case ITEM_TYPE_SEPARATOR:
          break;
+
       case ITEM_TYPE_CALLBACK:
       {
          Bookmark_Menu_Callback callback = bmi->next;
          Evas_Object *ed = elm_layout_edje_get(chrome);
-         if (callback) callback(bmi);
+         if (callback)
+            callback(bmi);
+
          edje_object_signal_emit(ed, "bookmark,item,clicked", "");
       }
       break;
+
       default:
       {
          Browser_Window *win = evas_object_data_get(chrome, "win");
          Evas_Object *ed = elm_layout_edje_get(chrome);
-         if (win) ewk_view_uri_set(win->current_view, bmi->next);
+         if (win)
+            ewk_view_uri_set(win->current_view, bmi->next);
+
          edje_object_signal_emit(ed, "bookmark,item,clicked", "");
       }
       break;
@@ -969,6 +1003,7 @@ on_action_bookmark_hide(void *data, Evas_Object * o __UNUSED__,
         eina_stringshare_del(bmi->text);
         free(bmi);
      }
+
    eina_stringshare_del(edje_object_part_text_get(edje, "bookmark-list-back-button-text"));
    eina_list_free(win->list_history_titles);
    win->list_history = NULL;
@@ -1051,6 +1086,7 @@ on_view_load_error(void *data __UNUSED__, Evas_Object * view __UNUSED__,
 
    if (error->is_cancellation)
       return;
+
    if (!frame)
      {
         ERR("error loading '%s': %s", error->failing_url, error->description);
@@ -1102,6 +1138,7 @@ on_inputmethods_changed(void *data, Evas_Object* view, void *event_info)
       elm_win_keyboard_mode_set(win, ELM_WIN_KEYBOARD_URL);
    else if (imh & EWK_IMH_PASSWORD)
       elm_win_keyboard_mode_set(win, ELM_WIN_KEYBOARD_PASSWORD);
+
 #if 0
    else if (imh & EWK_IMH_EMAIL)
       elm_win_keyboard_mode_set(win, ELM_WIN_KEYBOARD_
@@ -1148,8 +1185,8 @@ on_view_title_changed(void *data, Evas_Object * view __UNUSED__,
 
    win_title_set(win);
 }
-#endif
 
+#endif
 
 static void
 on_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__,
@@ -1244,6 +1281,7 @@ chrome_add(Browser_Window * win, const char *url)
         CRITICAL("Could not create view");
         goto error_view_create;
      }
+
    evas_object_focus_set(view, 1);
    elm_layout_content_set(chrome, "view", view);
 
@@ -1257,6 +1295,7 @@ chrome_add(Browser_Window * win, const char *url)
         INF("using custom user agent string: %s\n", win->app->user_agent);
         ewk_view_setting_user_agent_set(view, win->app->user_agent);
      }
+
    ewk_view_setting_enable_plugins_set(view, !win->app->disable_plugins);
 
    evas_object_event_callback_add(view, EVAS_CALLBACK_KEY_DOWN, on_key_down,
@@ -1367,3 +1406,4 @@ chrome_add(Browser_Window * win, const char *url)
    evas_object_del(chrome);
    return NULL;
 }
+

src/bin/gettext.h

@@ -212,10 +212,12 @@ dcpgettext_expr (const char *domain,
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
          free (msg_ctxt_id);
+
 #endif
       if (translation != msg_ctxt_id)
          return translation;
    }
+
    return msgid;
 }
 
@@ -258,10 +260,12 @@ dcnpgettext_expr (const char *domain,
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
          free (msg_ctxt_id);
+
 #endif
       if (!(translation == msg_ctxt_id || translation == msgid_plural))
          return translation;
    }
+
    return (n == 1 ? msgid : msgid_plural);
 }
 

src/bin/main.c

@@ -70,6 +70,7 @@ tab_add(Browser_Window * win, const char *url)
         CRITICAL("Could not create chrome.");
         goto error_chrome_create;
      }
+
    evas_object_size_hint_weight_set(chrome, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(chrome);
 
@@ -123,6 +124,7 @@ tab_focus_next(Browser_Window * win)
 
    if (win->current_tab > n_tabs)
       return EINA_FALSE;
+
    return tab_focus_nth(win, win->current_tab + 1);
 }
 
@@ -131,6 +133,7 @@ tab_focus_prev(Browser_Window * win)
 {
    if (win->current_tab == 0)
       return EINA_FALSE;
+
    return tab_focus_nth(win, win->current_tab - 1);
 }
 
@@ -209,6 +212,7 @@ add_win(App * app, const char *url)
         CRITICAL("Could not create background.");
         goto error_bg_create;
      }
+
    if (!edje_object_file_set(win->bg, PACKAGE_DATA_DIR "/default.edj", "bg"))
      {
         int err = edje_object_load_error_get(win->bg);
@@ -218,6 +222,7 @@ add_win(App * app, const char *url)
         CRITICAL("Could not load background theme: %s", msg);
         goto error_bg_theme_set;
      }
+
    evas_object_size_hint_weight_set(win->bg, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win->win, win->bg);
@@ -230,6 +235,7 @@ add_win(App * app, const char *url)
         CRITICAL("Could not create pager");
         goto error_pager_create;
      }
+
    elm_object_style_set(win->pager, "ewebkit");
    evas_object_size_hint_weight_set(win->pager, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
@@ -298,7 +304,8 @@ static const Ecore_Getopt options = {
       ECORE_GETOPT_COPYRIGHT('C', "copyright"),
       ECORE_GETOPT_LICENSE('L', "license"),
       ECORE_GETOPT_HELP('h', "help"),
-    ECORE_GETOPT_SENTINEL}
+      ECORE_GETOPT_SENTINEL
+   }
 };
 
 EAPI int
@@ -382,6 +389,7 @@ elm_main(int argc, char **argv)
         r = -1;
         goto end;
      }
+
    if (!ewk_settings_icon_database_path_set(path))
      {
         ERR("Could not set icon database path to %s", path);
@@ -429,5 +437,6 @@ elm_main(int argc, char **argv)
    history_shutdown();
    return r;
 }
+
 #endif
 ELM_MAIN()

src/bin/view.c

@@ -9,7 +9,6 @@ static const double LONG_CALCULATE_TIMEOUT = 0.6;
 #include <X11/Xlib.h>
 #endif
 
-
 /* value to consider as double/float error, differences smaller than
  * this are ignored
  */
@@ -24,8 +23,6 @@ static const double KINETIC_FRICTION = 1.0;
 /* Minimum value to consider velocity worth doing kinetic animation */
 static const Evas_Coord KINETIC_VELOCITY_THRESHOLD = 20;
 
-
-
 /* How long the auto zoom animation should take, in seconds */
 static const double ZOOM_AUTO_ANIMATION_DURATION = 0.5;
 
@@ -39,7 +36,6 @@ static const float ZOOM_AUTO_MIN = 0.3;
 static const float ZOOM_AUTO_MAX = 4.0;
 static const float ZOOM_AUTO_MIN_DIFFERENCE = 0.01;
 
-
 /* How long the interactive zoom animation should take, in seconds */
 static const double ZOOM_STEP_ANIMATION_DURATION = 0.8;
 
@@ -178,7 +174,6 @@ struct _View_Smart_Data
    Evas_Object *context_menu;
 };
 
-
 /***********************************************************************
  * Helper functions                                                    *
  **********************************************************************/
@@ -239,11 +234,13 @@ _view_zoom_fits_hit(View_Smart_Data *sd, const Ewk_Hit_Test *hit_test)
     */
    if (vw1 > ZOOM_AUTO_PADDING)
       vw1 -= ZOOM_AUTO_PADDING;
+
    if (vw2 > ZOOM_AUTO_PADDING)
       vw2 -= ZOOM_AUTO_PADDING;
 
    if (vh1 > ZOOM_AUTO_PADDING)
       vh1 -= ZOOM_AUTO_PADDING;
+
    if (vh2 > ZOOM_AUTO_PADDING)
       vh2 -= ZOOM_AUTO_PADDING;
 
@@ -431,6 +428,7 @@ _view_pan_pre_render(View_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy)
 
    if (dx > 0)
       px -= (pw - w);
+
    if (dy > 0)
       py -= (ph - h);
 
@@ -903,6 +901,7 @@ _view_zoom_stop(View_Smart_Data *sd, const Evas_Event_Mouse_Up *ev __UNUSED__)
              ewk_view_zoom_animated_set
                 (view, zoom, ZOOM_AUTO_ANIMATION_DURATION, x, y);
           }
+
         return EINA_TRUE;
      }
 
@@ -1004,7 +1003,6 @@ on_view_contextmenu_freed(void *data, Evas_Object *view, void *event_info)
    ecore_idler_add(_view_contextmenu_free, notify);
 }
 
-
 /***********************************************************************
  * Smart Class Methods:                                                *
  *                                                                     *
@@ -1061,10 +1059,13 @@ _view_smart_del(Evas_Object *o)
     */
    if (sd->animator.pan)
       ecore_animator_del(sd->animator.pan);
+
    if (sd->animator.zoom)
       ecore_animator_del(sd->animator.zoom);
+
    if (sd->animator.kinetic)
       ecore_animator_del(sd->animator.kinetic);
+
    if (sd->idler_close_window)
       ecore_idler_del(sd->idler_close_window);
 
@@ -1108,6 +1109,7 @@ _view_smart_calculate(Evas_Object *o)
             elapsed, LONG_CALCULATE_TIMEOUT);
         XSync(dpy, True); /* throw away events received during this timeout */
      }
+
 #endif
 }
 
@@ -1141,6 +1143,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
    /* we just want to start pan on button 1 (left) and not triple click */
    if (ev->button != 1)
       goto forward_event;
+
    if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK)
       goto forward_event;
 
@@ -1156,6 +1159,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
         if (skip && !(ev->flags & EVAS_BUTTON_DOUBLE_CLICK))
            goto forward_event;
      }
+
 #endif
 
    /* cancel previous animators, if any (there should be none) */
@@ -1164,6 +1168,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
         ecore_animator_del(sd->animator.pan);
         sd->animator.pan = NULL;
      }
+
    if (sd->animator.zoom)
      {
         ecore_animator_del(sd->animator.zoom);
@@ -1184,6 +1189,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
 forward_event:
    if (ev->button == 3) // forward of context menu event is special
       return ewk_view_context_menu_forward_event(sd->base.self, ev);
+
    /* If we should forward/feed event using parent class method, then
     * just do it and do NOT create an animator. See _view_smart_mouse_up().
     */
@@ -1347,6 +1353,7 @@ _run_dialog(Evas_Object *parent, enum dialog_type type, const char *message, con
              elm_box_pack_end(bx_v, dialog_data->entry);
              evas_object_show(dialog_data->entry);
           }
+
         if (type == DIALOG_PROMPT || type == DIALOG_CONFIRM)
           {
              Evas_Object *bx_h = elm_box_add(bx_v);
@@ -1513,6 +1520,7 @@ view_add(Evas_Object *parent)
              return NULL;
           }
      }
+
    view = evas_object_smart_add(canvas, smart);
    if (!view)
      {
@@ -1531,8 +1539,10 @@ void view_zoom_next_up(Evas_Object *view)
    Evas_Coord w, h;
    if (sd->flags.animated_zoom || sd->animator.pan || sd->animator.zoom)
       return;
+
    if (idx + 1 >= ZOOM_STEPS_LAST)
       return;
+
    if (sd->animator.kinetic)
      {
         ecore_animator_del(sd->animator.kinetic);
@@ -1556,13 +1566,16 @@ void view_zoom_next_down(Evas_Object *view)
    Evas_Coord w, h;
    if (sd->flags.animated_zoom || sd->animator.pan || sd->animator.zoom)
       return;
+
    if (idx == 0)
       return;
+
    if (sd->animator.kinetic)
      {
         ecore_animator_del(sd->animator.kinetic);
         sd->animator.kinetic = NULL;
      }
+
    idx--;
    zoom = ZOOM_STEPS[idx];
    sd->flags.animated_zoom = EINA_TRUE;
@@ -1600,3 +1613,4 @@ Ewk_Context_Menu *view_context_menu_get(Evas_Object *view)
 {
    return evas_object_data_get(view, "context-menu");
 }
+