diff options
author | Marco Hinz <mh.codebro+github@gmail.com> | 2018-04-07 16:20:31 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2018-04-07 16:20:31 +0200 |
commit | 929a732d006ddd2bac49cf5e555e9e83372a511d (patch) | |
tree | 4fa063dfbda65c23663de8dad0e4e8607231fe80 /src | |
parent | 1ca138f236d626b68325f19c7303e81fa225e180 (diff) | |
download | rneovim-929a732d006ddd2bac49cf5e555e9e83372a511d.tar.gz rneovim-929a732d006ddd2bac49cf5e555e9e83372a511d.tar.bz2 rneovim-929a732d006ddd2bac49cf5e555e9e83372a511d.zip |
build/clang 6.0.0: fix type conversion warnings (#8235)
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/tui/tui.c | 4 | ||||
-rw-r--r-- | src/nvim/viml/parser/expressions.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index c57991bff2..a7d4d49e0c 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -925,7 +925,6 @@ static void tui_set_mode(UI *ui, ModeShape mode) } TUIData *data = ui->data; cursorentry_T c = data->cursor_shapes[mode]; - int shape = c.shape; if (c.id != 0 && ui->rgb) { int attr = syn_id2attr(c.id); @@ -936,7 +935,8 @@ static void tui_set_mode(UI *ui, ModeShape mode) } } - switch (shape) { + int shape; + switch (c.shape) { case SHAPE_BLOCK: shape = 1; break; case SHAPE_HOR: shape = 3; break; case SHAPE_VER: shape = 5; break; diff --git a/src/nvim/viml/parser/expressions.c b/src/nvim/viml/parser/expressions.c index 4196ecb9d2..ee59dc8c96 100644 --- a/src/nvim/viml/parser/expressions.c +++ b/src/nvim/viml/parser/expressions.c @@ -779,7 +779,8 @@ const char *viml_pexpr_repr_token(const ParserState *const pstate, eltkn_opt_scope_tab[token.data.opt.scope], (int)token.data.opt.len, token.data.opt.name) TKNARGS(kExprLexPlainIdentifier, "(scope=%s,autoload=%i)", - intchar2str(token.data.var.scope), (int)token.data.var.autoload) + intchar2str((int)token.data.var.scope), + (int)token.data.var.autoload) TKNARGS(kExprLexNumber, "(is_float=%i,base=%i,val=%lg)", (int)token.data.num.is_float, (int)token.data.num.base, |