Skip to content

Commit 2f40d12

Browse files
brammoolbrammool
committed
patch 8.0.1215: newer gcc warns for implicit fallthrough
Problem: Newer gcc warns for implicit fallthrough. Solution: Consistently use a FALLTHROUGH comment. (Christian Brabandt)
1 parent 4f19828 commit 2f40d12

14 files changed

Lines changed: 39 additions & 29 deletions

File tree

‎src/buffer.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4325,6 +4325,7 @@ build_stl_str_hl(
43254325

43264326
case STL_OFFSET_X:
43274327
base = 'X';
4328+
/* FALLTHROUGH */
43284329
case STL_OFFSET:
43294330
#ifdef FEAT_BYTEOFF
43304331
l = ml_find_line_or_offset(wp->w_buffer, wp->w_cursor.lnum, NULL);
@@ -4336,6 +4337,7 @@ build_stl_str_hl(
43364337

43374338
case STL_BYTEVAL_X:
43384339
base = 'X';
4340+
/* FALLTHROUGH */
43394341
case STL_BYTEVAL:
43404342
num = byteval;
43414343
if (num == NL)

‎src/edit.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ edit(
984984
case ESC: /* End input mode */
985985
if (echeck_abbr(ESC + ABBR_OFF))
986986
break;
987-
/*FALLTHROUGH*/
987+
/* FALLTHROUGH */
988988

989989
case Ctrl_C: /* End input mode */
990990
#ifdef FEAT_CMDWIN
@@ -5774,13 +5774,16 @@ quote_meta(char_u *dest, char_u *src, int len)
57745774
if (ctrl_x_mode == CTRL_X_DICTIONARY
57755775
|| ctrl_x_mode == CTRL_X_THESAURUS)
57765776
break;
5777+
/* FALLTHROUGH */
57775778
case '~':
57785779
if (!p_magic) /* quote these only if magic is set */
57795780
break;
5781+
/* FALLTHROUGH */
57805782
case '\\':
57815783
if (ctrl_x_mode == CTRL_X_DICTIONARY
57825784
|| ctrl_x_mode == CTRL_X_THESAURUS)
57835785
break;
5786+
/* FALLTHROUGH */
57845787
case '^': /* currently it's not needed. */
57855788
case '$':
57865789
m++;

‎src/eval.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6995,7 +6995,7 @@ free_tv(typval_T *varp)
69956995
{
69966996
case VAR_FUNC:
69976997
func_unref(varp->vval.v_string);
6998-
/*FALLTHROUGH*/
6998+
/* FALLTHROUGH */
69996999
case VAR_STRING:
70007000
vim_free(varp->vval.v_string);
70017001
break;
@@ -7040,7 +7040,7 @@ clear_tv(typval_T *varp)
70407040
{
70417041
case VAR_FUNC:
70427042
func_unref(varp->vval.v_string);
7043-
/*FALLTHROUGH*/
7043+
/* FALLTHROUGH */
70447044
case VAR_STRING:
70457045
vim_free(varp->vval.v_string);
70467046
varp->vval.v_string = NULL;

‎src/ex_docmd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4115,7 +4115,7 @@ set_one_cmd_context(
41154115
case CMD_bunload:
41164116
while ((xp->xp_pattern = vim_strchr(arg, ' ')) != NULL)
41174117
arg = xp->xp_pattern + 1;
4118-
/*FALLTHROUGH*/
4118+
/* FALLTHROUGH */
41194119
case CMD_buffer:
41204120
case CMD_sbuffer:
41214121
case CMD_checktime:

‎src/ex_getln.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,9 +1563,8 @@ getcmdline(
15631563
break;
15641564
goto cmdline_not_changed;
15651565
}
1566-
/* FALLTHROUGH */
1567-
15681566
#ifdef FEAT_CMDHIST
1567+
/* FALLTHROUGH */
15691568
case K_UP:
15701569
case K_DOWN:
15711570
case K_S_UP:

‎src/if_perl.xs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,7 @@ perl_to_vim(SV *sv, typval_T *rettv)
11011101
rettv->vval.v_number = SvIV(sv);
11021102
break;
11031103
}
1104+
/* FALLTHROUGH */
11041105
case SVt_PV: /* string */
11051106
{
11061107
size_t len = 0;

‎src/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2228,7 +2228,7 @@ command_line_scan(mparm_T *parmp)
22282228
argv_idx = -1;
22292229
break;
22302230
}
2231-
/*FALLTHROUGH*/
2231+
/* FALLTHROUGH */
22322232
case 'S': /* "-S {file}" execute Vim script */
22332233
case 'i': /* "-i {viminfo}" use for viminfo */
22342234
#ifndef FEAT_DIFF
@@ -2386,7 +2386,7 @@ command_line_scan(mparm_T *parmp)
23862386
argv_idx = -1;
23872387
break;
23882388
}
2389-
/*FALLTHROUGH*/
2389+
/* FALLTHROUGH */
23902390
case 'W': /* "-W {scriptout}" overwrite script file */
23912391
if (scriptout != NULL)
23922392
goto scripterror;

‎src/message.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,8 @@ emsg(char_u *s)
670670

671671
ex_exitval = 1;
672672

673-
/* Reset msg_silent, an error causes messages to be switched back on. */
673+
/* Reset msg_silent, an error causes messages to be switched back on.
674+
*/
674675
msg_silent = 0;
675676
cmd_silent = FALSE;
676677

@@ -2837,7 +2838,7 @@ do_more_prompt(int typed_char)
28372838
skip_redraw = TRUE; /* skip redraw once */
28382839
need_wait_return = FALSE; /* don't wait in main() */
28392840
}
2840-
/*FALLTHROUGH*/
2841+
/* FALLTHROUGH */
28412842
case 'q': /* quit */
28422843
case Ctrl_C:
28432844
case ESC:

‎src/normal.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,6 +1945,7 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank)
19451945
AppendToRedobuff((char_u *)"!\r"); /* use any last used !cmd */
19461946
else
19471947
bangredo = TRUE; /* do_bang() will put cmd in redo buffer */
1948+
/* FALLTHROUGH */
19481949

19491950
case OP_INDENT:
19501951
case OP_COLON:
@@ -5150,7 +5151,7 @@ nv_zet(cmdarg_T *cap)
51505151
break;
51515152
}
51525153
undo = TRUE;
5153-
/*FALLTHROUGH*/
5154+
/* FALLTHROUGH */
51545155

51555156
case 'g': /* "zg": add good word to word list */
51565157
case 'w': /* "zw": add wrong word to word list */
@@ -8267,7 +8268,7 @@ nv_g_cmd(cmdarg_T *cap)
82678268
/* "g'm" and "g`m": jump to mark without setting pcmark */
82688269
case '\'':
82698270
cap->arg = TRUE;
8270-
/*FALLTHROUGH*/
8271+
/* FALLTHROUGH */
82718272
case '`':
82728273
nv_gomark(cap);
82738274
break;
@@ -8328,7 +8329,7 @@ nv_g_cmd(cmdarg_T *cap)
83288329
case 'q':
83298330
case 'w':
83308331
oap->cursor_start = curwin->w_cursor;
8331-
/*FALLTHROUGH*/
8332+
/* FALLTHROUGH */
83328333
case '~':
83338334
case 'u':
83348335
case 'U':
@@ -9117,7 +9118,7 @@ nv_edit(cmdarg_T *cap)
91179118
* the first column, then it inserts. */
91189119
if (curwin->w_cursor.col == 0)
91199120
break;
9120-
/*FALLTHROUGH*/
9121+
/* FALLTHROUGH */
91219122

91229123
case 'a': /* "a"ppend is like "i"nsert on the next character. */
91239124
#ifdef FEAT_VIRTUALEDIT

‎src/regexp.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ regatom(int *flagp)
19971997
goto collection;
19981998

19991999
/* "\_x" is character class plus newline */
2000-
/*FALLTHROUGH*/
2000+
/* FALLTHROUGH */
20012001

20022002
/*
20032003
* Character classes.
@@ -5847,7 +5847,7 @@ regrepeat(
58475847
case IDENT:
58485848
case IDENT + ADD_NL:
58495849
testval = TRUE;
5850-
/*FALLTHROUGH*/
5850+
/* FALLTHROUGH */
58515851
case SIDENT:
58525852
case SIDENT + ADD_NL:
58535853
while (count < maxcount)
@@ -5877,7 +5877,7 @@ regrepeat(
58775877
case KWORD:
58785878
case KWORD + ADD_NL:
58795879
testval = TRUE;
5880-
/*FALLTHROUGH*/
5880+
/* FALLTHROUGH */
58815881
case SKWORD:
58825882
case SKWORD + ADD_NL:
58835883
while (count < maxcount)
@@ -5908,7 +5908,7 @@ regrepeat(
59085908
case FNAME:
59095909
case FNAME + ADD_NL:
59105910
testval = TRUE;
5911-
/*FALLTHROUGH*/
5911+
/* FALLTHROUGH */
59125912
case SFNAME:
59135913
case SFNAME + ADD_NL:
59145914
while (count < maxcount)
@@ -5938,7 +5938,7 @@ regrepeat(
59385938
case PRINT:
59395939
case PRINT + ADD_NL:
59405940
testval = TRUE;
5941-
/*FALLTHROUGH*/
5941+
/* FALLTHROUGH */
59425942
case SPRINT:
59435943
case SPRINT + ADD_NL:
59445944
while (count < maxcount)
@@ -6131,7 +6131,7 @@ regrepeat(
61316131
case ANYOF:
61326132
case ANYOF + ADD_NL:
61336133
testval = TRUE;
6134-
/*FALLTHROUGH*/
6134+
/* FALLTHROUGH */
61356135

61366136
case ANYBUT:
61376137
case ANYBUT + ADD_NL:

0 commit comments

Comments
 (0)