Mercurial > hg > forks > geeqie
changeset 2608:62da56d27277
Fix the implicit-fallthrough stuff in code
First, this flag was not supported by older gcc.
And second and more important, there _was_ a bug with a lost break in
9643a2546bcc. Combined with a unreachable code segment.
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Sun, 17 Sep 2017 15:53:47 +0100 |
| parents | 4a7ef0180612 |
| children | 5beaa1da4f14 |
| files | configure.in src/ui_bookmark.c src/ui_pathsel.c src/utilops.c |
| diffstat | 4 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Sun Sep 17 15:12:21 2017 +0100 +++ b/configure.in Sun Sep 17 15:53:47 2017 +0100 @@ -18,7 +18,7 @@ AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/]) # Add -Werror to the default CFLAGS -CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=implicit-fallthrough -Wno-error=return-type" +CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type" # Check for rightly dirs AC_CONFIG_SRCDIR([src/main.c])
--- a/src/ui_bookmark.c Sun Sep 17 15:12:21 2017 +0100 +++ b/src/ui_bookmark.c Sun Sep 17 15:53:47 2017 +0100 @@ -450,6 +450,7 @@ { case GDK_KEY_F10: if (!(event->state & GDK_CONTROL_MASK)) return FALSE; + /* fall through */ case GDK_KEY_Menu: bookmark_menu_popup(bm, button, 0, event->time, TRUE); return TRUE;
--- a/src/ui_pathsel.c Sun Sep 17 15:12:21 2017 +0100 +++ b/src/ui_pathsel.c Sun Sep 17 15:53:47 2017 +0100 @@ -698,6 +698,7 @@ { case GDK_KEY_F10: if (!(event->state & GDK_CONTROL_MASK)) return FALSE; + /* fall through */ case GDK_KEY_Menu: dest_view_store_selection(dd, GTK_TREE_VIEW(view)); dest_popup_menu(dd, GTK_TREE_VIEW(view), 0, event->time, TRUE);
--- a/src/utilops.c Sun Sep 17 15:12:21 2017 +0100 +++ b/src/utilops.c Sun Sep 17 15:53:47 2017 +0100 @@ -1106,6 +1106,7 @@ { case UTILITY_TYPE_COPY: file_data_sc_update_ci_copy_list(ud->flist, ud->dest_path); + break; case UTILITY_TYPE_MOVE: file_data_sc_update_ci_move_list(ud->flist, ud->dest_path); break; @@ -1845,8 +1846,6 @@ case UTILITY_PHASE_ENTERING: file_util_check_ci(ud); break; - - ud->phase = UTILITY_PHASE_CHECKED; case UTILITY_PHASE_CHECKED: file_util_perform_ci(ud); break;