mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-21 02:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/typval_encode: Fix linter errors

Browse Source
This commit is contained in:
ZyX
2016-12-25 21:20:31 +03:00
parent 38ab553eb2
commit dd27fcfda5
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/eval/typval_encode.c.h
View File

@@ -331,11 +331,11 @@ static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
varnumber_T highest_bits; varnumber_T highest_bits;
varnumber_T high_bits; varnumber_T high_bits;
varnumber_T low_bits; varnumber_T low_bits;
/* List of 4 integers; first is signed (should be 1 or -1, but */ // List of 4 integers; first is signed (should be 1 or -1, but
/* this is not checked), second is unsigned and have at most */ // this is not checked), second is unsigned and have at most
/* one (sign is -1) or two (sign is 1) non-zero bits (number of */ // one (sign is -1) or two (sign is 1) non-zero bits (number of
/* bits is not checked), other unsigned and have at most 31 */ // bits is not checked), other unsigned and have at most 31
/* non-zero bits (number of bits is not checked).*/ // non-zero bits (number of bits is not checked).
if (val_di->di_tv.v_type != VAR_LIST if (val_di->di_tv.v_type != VAR_LIST
|| (val_list = val_di->di_tv.vval.v_list) == NULL || (val_list = val_di->di_tv.vval.v_list) == NULL
|| val_list->lv_len != 4 || val_list->lv_len != 4
@@ -565,9 +565,11 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
const list_T *const kv_pair = cur_mpsv->data.l.li->li_tv.vval.v_list; const list_T *const kv_pair = cur_mpsv->data.l.li->li_tv.vval.v_list;
TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK( TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(
encode_vim_to__error_ret, kv_pair->lv_first->li_tv); encode_vim_to__error_ret, kv_pair->lv_first->li_tv);
if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE( if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME,
TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack, &mpstack,
&kv_pair->lv_first->li_tv, copyID, objname) == FAIL) { &kv_pair->lv_first->li_tv,
copyID,
objname) == FAIL) {
goto encode_vim_to__error_ret; goto encode_vim_to__error_ret;
} }
TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(); TYPVAL_ENCODE_CONV_DICT_AFTER_KEY();
@@ -641,9 +643,8 @@ TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
} }
} }
assert(cur_tv != NULL); assert(cur_tv != NULL);
if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE( if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack,
TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack, cur_tv, copyID, objname) cur_tv, copyID, objname) == FAIL) {
== FAIL) {
goto encode_vim_to__error_ret; goto encode_vim_to__error_ret;
} }
} }