diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-05 18:14:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-05 18:14:03 +0200 |
| commit | 827b165b2aebad2cfe98cc6d5804c6c0fe8afd89 (patch) | |
| tree | eb91cbe5b6be5b9830d69cafcc4f7bdb626bb170 | |
| parent | 89c79b99328b66f77f1d12dc8c6701dfe2c57f15 (diff) | |
| download | vim-git-827b165b2aebad2cfe98cc6d5804c6c0fe8afd89.tar.gz | |
patch 7.4.1819v7.4.1819
Problem: Compiler warnings when sprintf() is a macro.
Solution: Don't interrupt sprintf() with an #ifdef. (Michael Jarvis,
closes #788)
| -rw-r--r-- | src/fileio.c | 16 | ||||
| -rw-r--r-- | src/tag.c | 12 | ||||
| -rw-r--r-- | src/term.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 20 insertions, 16 deletions
diff --git a/src/fileio.c b/src/fileio.c index 0ddd07928..5626712f3 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -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 - ); } } @@ -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; } diff --git a/src/term.c b/src/term.c index 4af9aeb84..b9af73101 100644 --- a/src/term.c +++ b/src/term.c @@ -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")); diff --git a/src/version.c b/src/version.c index 1045c21ec..0191775db 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1819, +/**/ 1818, /**/ 1817, |