aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 7.4.1819

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

16
src/fileio.c
View File

@@ -5230,14 +5230,14 @@ msg_add_lines(
if (insert_space)
*p++ = ' ';
if (shortmess(SHM_LINES))
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
"%ldL, %lldC", lnum, (long long)nchars
sprintf((char *)p,
"%ldL, %lldC", lnum, (long long)nchars);
#else
sprintf((char *)p,
/* Explicit typecast avoids warning on Mac OS X 10.6 */
"%ldL, %ldC", lnum, (long)nchars
"%ldL, %ldC", lnum, (long)nchars);
#endif
);
else
{
if (lnum == 1)
@@ -5248,14 +5248,14 @@ msg_add_lines(
if (nchars == 1)
STRCPY(p, _("1 character"));
else
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
_("%lld characters"), (long long)nchars
sprintf((char *)p,
_("%lld characters"), (long long)nchars);
#else
sprintf((char *)p,
/* Explicit typecast avoids warning on Mac OS X 10.6 */
_("%ld characters"), (long)nchars
_("%ld characters"), (long)nchars);
#endif
);
}
}

12
src/tag.c
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;
}

6
src/term.c
View File

@@ -2630,12 +2630,12 @@ term_color(char_u *s, int n)
|| STRCMP(s + i + 1, "%dm") == 0)
&& (s[i] == '3' || s[i] == '4'))
{
sprintf(buf,
#ifdef TERMINFO
"%s%s%%p1%%dm",
char *format = "%s%s%%p1%%dm";
#else
"%s%s%%dm",
char *format = "%s%s%%dm";
#endif
sprintf(buf, format,
i == 2 ? IF_EB("\033[", ESC_STR "[") : "\233",
s[i] == '3' ? (n >= 16 ? "38;5;" : "9")
: (n >= 16 ? "48;5;" : "10"));

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1819,
/**/
1818,
/**/