From 0eb1d7ca4ca2b1e6c5323ec39535ad238b503aff Mon Sep 17 00:00:00 2001 From: ZyX Date: Mon, 16 Apr 2018 11:31:27 +0300 Subject: [PATCH] option: Silence PVS/V594: GLOBAL_WO macros is not really necessary In that case it is completely possible to just use w_allbuf_opt directly. --- src/nvim/option.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/nvim/option.c b/src/nvim/option.c index c43ba2fc4f..9dc29bbfd9 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4184,27 +4184,23 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, if (value < 0) { errmsg = e_positive; } - } else if (pp == &curwin->w_p_fdl - || pp == (long *)GLOBAL_WO(&curwin->w_p_fdl)) { + } else if (pp == &curwin->w_p_fdl || pp == &curwin->w_allbuf_opt.wo_fdl) { if (value < 0) { errmsg = e_positive; } - } else if (pp == &curwin->w_p_fdc - || pp == (long *)GLOBAL_WO(&curwin->w_p_fdc)) { + } else if (pp == &curwin->w_p_fdc || pp == &curwin->w_allbuf_opt.wo_fdc) { if (value < 0) { errmsg = e_positive; } else if (value > 12) { errmsg = e_invarg; } - } else if (pp == &curwin->w_p_cole - || pp == (long *)GLOBAL_WO(&curwin->w_p_cole)) { + } else if (pp == &curwin->w_p_cole || pp == &curwin->w_allbuf_opt.wo_cole) { if (value < 0) { errmsg = e_positive; } else if (value > 3) { errmsg = e_invarg; } - } else if (pp == &curwin->w_p_nuw - || pp == (long *)GLOBAL_WO(&curwin->w_p_nuw)) { + } else if (pp == &curwin->w_p_nuw || pp == &curwin->w_allbuf_opt.wo_nuw) { if (value < 1) { errmsg = e_positive; } else if (value > 10) {