1
0
forked from aniani/vim

patch 7.4.1819

Problem:    Compiler warnings when sprintf() is a macro.
Solution:   Don't interrupt sprintf() with an #ifdef. (Michael Jarvis,
            closes #788)
This commit is contained in:
Bram Moolenaar
2016-05-05 18:14:03 +02:00
parent 89c79b9932
commit 827b165b2a
4 changed files with 20 additions and 16 deletions

View File

@@ -2264,6 +2264,7 @@ parse_line:
if (ga_grow(&ga_match[mtt], 1) == OK)
{
int len;
int heuristic;
if (help_only)
{
@@ -2293,13 +2294,14 @@ parse_line:
p[len] = '@';
STRCPY(p + len + 1, help_lang);
#endif
sprintf((char *)p + len + 1 + ML_EXTRA, "%06d",
help_heuristic(tagp.tagname,
match_re ? matchoff : 0, !match_no_ic)
heuristic = help_heuristic(tagp.tagname,
match_re ? matchoff : 0, !match_no_ic);
#ifdef FEAT_MULTI_LANG
+ help_pri
heuristic += help_pri;
#endif
);
sprintf((char *)p + len + 1 + ML_EXTRA, "%06d",
heuristic);
}
*tagp.tagname_end = TAB;
}