mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-13 13:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

quickfix: Fix PVS/V547,V560: no conversion with fixed &encoding

Browse Source
This commit is contained in:
ZyX
2018-04-22 18:53:49 +03:00
parent b7a46f2299
commit 4d43ce85f1
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/quickfix.c
View File

@@ -4740,14 +4740,6 @@ void ex_helpgrep(exarg_T *eap)
regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING); regmatch.regprog = vim_regcomp(eap->arg, RE_MAGIC + RE_STRING);
regmatch.rm_ic = FALSE; regmatch.rm_ic = FALSE;
if (regmatch.regprog != NULL) { if (regmatch.regprog != NULL) {
vimconv_T vc;
/* Help files are in utf-8 or latin1, convert lines when 'encoding'
* differs. */
vc.vc_type = CONV_NONE;
if (!enc_utf8)
convert_setup(&vc, (char_u *)"utf-8", p_enc);
/* create a new quickfix list */ /* create a new quickfix list */
qf_new_list(qi, *eap->cmdlinep); qf_new_list(qi, *eap->cmdlinep);
@@ -4780,15 +4772,6 @@ void ex_helpgrep(exarg_T *eap)
lnum = 1; lnum = 1;
while (!vim_fgets(IObuff, IOSIZE, fd) && !got_int) { while (!vim_fgets(IObuff, IOSIZE, fd) && !got_int) {
char_u *line = IObuff; char_u *line = IObuff;
/* Convert a line if 'encoding' is not utf-8 and
* the line contains a non-ASCII character. */
if (vc.vc_type != CONV_NONE
&& has_non_ascii(IObuff)) {
line = string_convert(&vc, IObuff, NULL);
if (line == NULL)
line = IObuff;
}
if (vim_regexec(&regmatch, line, (colnr_T)0)) { if (vim_regexec(&regmatch, line, (colnr_T)0)) {
int l = (int)STRLEN(line); int l = (int)STRLEN(line);
@@ -4831,8 +4814,6 @@ void ex_helpgrep(exarg_T *eap)
} }
vim_regfree(regmatch.regprog); vim_regfree(regmatch.regprog);
if (vc.vc_type != CONV_NONE)
convert_setup(&vc, NULL, NULL);
qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE; qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_ptr =