aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.0260: several lines of code are duplicated

Browse Source 
Problem:    Several lines of code are duplicated.
Solution:   Move duplicated code to a function. (Yegappan Lakshmanan,
            closes #5330)
This commit is contained in:
Bram Moolenaar
2020-02-15 23:06:45 +01:00
parent ebdf3c964a
commit f4140488c7
10 changed files with 128 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/quickfix.c
View File

@@ -980,11 +980,11 @@ qf_parse_fmt_t(regmatch_T *rmp, int midx, qffields_T *fields)
}
/*
* Parse the match for '%+' format pattern. The whole matching line is included
* in the error string. Return the matched line in "fields->errmsg".
* Copy a non-error line into the error string. Return the matched line in
* "fields->errmsg".
*/
static int
qf_parse_fmt_plus(char_u *linebuf, int linelen, qffields_T *fields)
copy_nonerror_line(char_u *linebuf, int linelen, qffields_T *fields)
{
char_u *p;
@@ -996,7 +996,9 @@ qf_parse_fmt_plus(char_u *linebuf, int linelen, qffields_T *fields)
fields->errmsg = p;
fields->errmsglen = linelen + 1;
}
// copy whole line to error message
vim_strncpy(fields->errmsg, linebuf, linelen);
return QF_OK;
}
@@ -1180,7 +1182,7 @@ qf_parse_match(
else if (i == 5)
{
if (fmt_ptr->flags == '+' && !qf_multiscan) // %+
status = qf_parse_fmt_plus(linebuf, linelen, fields);
status = copy_nonerror_line(linebuf, linelen, fields);
else if (midx > 0) // %m
status = qf_parse_fmt_m(regmatch, midx, fields);
}
@@ -1307,23 +1309,11 @@ qf_parse_file_pfx(
static int
qf_parse_line_nomatch(char_u *linebuf, int linelen, qffields_T *fields)
{
char_u *p;
fields->namebuf[0] = NUL; // no match found, remove file name
fields->lnum = 0; // don't jump to this line
fields->valid = FALSE;
if (linelen >= fields->errmsglen)
{
// linelen + null terminator
if ((p = vim_realloc(fields->errmsg, linelen + 1)) == NULL)
return QF_NOMEM;
fields->errmsg = p;
fields->errmsglen = linelen + 1;
}
// copy whole line to error message
vim_strncpy(fields->errmsg, linebuf, linelen);
return QF_OK;
return copy_nonerror_line(linebuf, linelen, fields);
}
/*