clang/"Dead assignment"

This commit is contained in:
Justin M. Keyes
2019-01-13 17:10:46 +01:00
parent 94fc3e0182
commit ddd4ed3ce5
5 changed files with 4 additions and 6 deletions

View File

@@ -10103,6 +10103,7 @@ Dictionary commands_array(buf_T *buf)
{ {
Dictionary rv = ARRAY_DICT_INIT; Dictionary rv = ARRAY_DICT_INIT;
Object obj = NIL; Object obj = NIL;
(void)obj; // Avoid "dead assignment" warning.
char str[10]; char str[10];
garray_T *gap = (buf == NULL) ? &ucmds : &buf->b_ucmds; garray_T *gap = (buf == NULL) ? &ucmds : &buf->b_ucmds;

View File

@@ -1808,7 +1808,6 @@ static int command_line_changed(CommandLineState *s)
if (has_event(EVENT_CMDLINECHANGED)) { if (has_event(EVENT_CMDLINECHANGED)) {
TryState tstate; TryState tstate;
Error err = ERROR_INIT; Error err = ERROR_INIT;
bool tl_ret = true;
dict_T *dict = get_vim_var_dict(VV_EVENT); dict_T *dict = get_vim_var_dict(VV_EVENT);
char firstcbuf[2]; char firstcbuf[2];
@@ -1825,14 +1824,13 @@ static int command_line_changed(CommandLineState *s)
(char_u *)firstcbuf, false, curbuf); (char_u *)firstcbuf, false, curbuf);
tv_dict_clear(dict); tv_dict_clear(dict);
tl_ret = try_leave(&tstate, &err); bool tl_ret = try_leave(&tstate, &err);
if (!tl_ret && ERROR_SET(&err)) { if (!tl_ret && ERROR_SET(&err)) {
msg_putchar('\n'); msg_putchar('\n');
msg_printf_attr(HL_ATTR(HLF_E)|MSG_HIST, (char *)e_autocmd_err, err.msg); msg_printf_attr(HL_ATTR(HLF_E)|MSG_HIST, (char *)e_autocmd_err, err.msg);
api_clear_error(&err); api_clear_error(&err);
redrawcmd(); redrawcmd();
} }
tl_ret = true;
} }
// 'incsearch' highlighting. // 'incsearch' highlighting.

View File

@@ -760,8 +760,6 @@ readfile (
fenc = (char_u *)"utf-8"; fenc = (char_u *)"utf-8";
fenc_alloced = false; fenc_alloced = false;
c = 1;
} else if (*p_fencs == NUL) { } else if (*p_fencs == NUL) {
fenc = curbuf->b_p_fenc; /* use format from buffer */ fenc = curbuf->b_p_fenc; /* use format from buffer */
fenc_alloced = FALSE; fenc_alloced = FALSE;

View File

@@ -641,7 +641,7 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
linenr_T lnum = wp->w_cursor.lnum; linenr_T lnum = wp->w_cursor.lnum;
char_u *line = ml_get(lnum); char_u *line = ml_get(lnum);
char_u *ptr = line; char_u *ptr = line;
char_u *ptr_end = line; char_u *ptr_end;
char_u *ptr_row_offset = line; // Where we begin adjusting `ptr_end` char_u *ptr_row_offset = line; // Where we begin adjusting `ptr_end`
// Find the offset where scanning should begin. // Find the offset where scanning should begin.

View File

@@ -3770,6 +3770,7 @@ find_decl (
clearpos(&found_pos); clearpos(&found_pos);
for (;; ) { for (;; ) {
valid = false; valid = false;
(void)valid; // Avoid "dead assignment" warning.
t = searchit(curwin, curbuf, &curwin->w_cursor, FORWARD, t = searchit(curwin, curbuf, &curwin->w_cursor, FORWARD,
pat, 1L, searchflags, RE_LAST, (linenr_T)0, NULL); pat, 1L, searchflags, RE_LAST, (linenr_T)0, NULL);
if (curwin->w_cursor.lnum >= old_pos.lnum) if (curwin->w_cursor.lnum >= old_pos.lnum)