IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint error in option.c

Browse Source
This commit is contained in:
George Zhao 2018-01-17 22:29:23 +08:00
parent 82adba0f2f
commit 10b1738f59
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/nvim/option.c
View File

@ -831,24 +831,26 @@ set_option_default (
if (flags & P_STRING) { if (flags & P_STRING) {
/* Use set_string_option_direct() for local options to handle /* Use set_string_option_direct() for local options to handle
* freeing and allocating the value. */ * freeing and allocating the value. */
if (options[opt_idx].indir != PV_NONE) if (options[opt_idx].indir != PV_NONE) {
set_string_option_direct(NULL, opt_idx, set_string_option_direct(NULL, opt_idx,
options[opt_idx].def_val[dvi], opt_flags, 0); options[opt_idx].def_val[dvi], opt_flags, 0);
else { } else {
if ((opt_flags & OPT_FREE) && (flags & P_ALLOCED)) if ((opt_flags & OPT_FREE) && (flags & P_ALLOCED)) {
free_string_option(*(char_u **)(varp)); free_string_option(*(char_u **)(varp));
}
*(char_u **)varp = options[opt_idx].def_val[dvi]; *(char_u **)varp = options[opt_idx].def_val[dvi];
options[opt_idx].flags &= ~P_ALLOCED; options[opt_idx].flags &= ~P_ALLOCED;
} }
} else if (flags & P_NUM) { } else if (flags & P_NUM) {
if (options[opt_idx].indir == PV_SCROLL) if (options[opt_idx].indir == PV_SCROLL) {
win_comp_scroll(curwin); win_comp_scroll(curwin);
else { } else {
*(long *)varp = (long)(intptr_t)options[opt_idx].def_val[dvi]; *(long *)varp = (long)(intptr_t)options[opt_idx].def_val[dvi];
/* May also set global value for local option. */ // May also set global value for local option.
if (both) if (both) {
*(long *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) = *(long *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) =
*(long *)varp; *(long *)varp;
}
} }
} else { /* P_BOOL */ } else { /* P_BOOL */
*(int *)varp = (int)(intptr_t)options[opt_idx].def_val[dvi]; *(int *)varp = (int)(intptr_t)options[opt_idx].def_val[dvi];
@ -1440,20 +1442,19 @@ do_set (
* [-]0-9 set number * [-]0-9 set number
* other error * other error
*/ */
++arg; arg++;
if (nextchar == '&') if (nextchar == '&') {
value = (long)(intptr_t)options[opt_idx].def_val[ value = (long)(intptr_t)options[opt_idx].def_val[
((flags & P_VI_DEF) || cp_val) ((flags & P_VI_DEF) || cp_val) ? VI_DEFAULT : VIM_DEFAULT];
? VI_DEFAULT : VIM_DEFAULT]; } else if (nextchar == '<') {
else if (nextchar == '<') { // For 'undolevels' NO_LOCAL_UNDOLEVEL means to
/* For 'undolevels' NO_LOCAL_UNDOLEVEL means to // use the global value.
* use the global value. */ if ((long *)varp == &curbuf->b_p_ul && opt_flags == OPT_LOCAL) {
if ((long *)varp == &curbuf->b_p_ul
&& opt_flags == OPT_LOCAL)
value = NO_LOCAL_UNDOLEVEL; value = NO_LOCAL_UNDOLEVEL;
else } else {
value = *(long *)get_varp_scope( value = *(long *)get_varp_scope(
&(options[opt_idx]), OPT_GLOBAL); &(options[opt_idx]), OPT_GLOBAL);
}
} else if (((long *)varp == &p_wc } else if (((long *)varp == &p_wc
|| (long *)varp == &p_wcm) || (long *)varp == &p_wcm)
&& (*arg == '<' && (*arg == '<'
@ -5011,11 +5012,13 @@ static int optval_default(vimoption_T *p, char_u *varp)
if (varp == NULL) if (varp == NULL)
return TRUE; /* hidden option is always at default */ return TRUE; /* hidden option is always at default */
dvi = ((p->flags & P_VI_DEF) || p_cp) ? VI_DEFAULT : VIM_DEFAULT; dvi = ((p->flags & P_VI_DEF) || p_cp) ? VI_DEFAULT : VIM_DEFAULT;
if (p->flags & P_NUM) if (p->flags & P_NUM) {
return *(long *)varp == (long)(intptr_t)p->def_val[dvi]; return *(long *)varp == (long)(intptr_t)p->def_val[dvi];
if (p->flags & P_BOOL) }
if (p->flags & P_BOOL) {
return *(int *)varp == (int)(intptr_t)p->def_val[dvi]; return *(int *)varp == (int)(intptr_t)p->def_val[dvi];
/* P_STRING */ }
// P_STRING
return STRCMP(*(char_u **)varp, p->def_val[dvi]) == 0; return STRCMP(*(char_u **)varp, p->def_val[dvi]) == 0;
} }