patch 7.4.1819

Problem:    Compiler warnings when sprintf() is a macro.
Solution:   Don't interrupt sprintf() with an #ifdef. (Michael Jarvis,
            closes #788)

diff --git a/src/fileio.c b/src/fileio.c
index 0ddd079280991b5e3f51523b87c27b63d66a3080..5626712f3c0527bf01f26e71b1ead9644a6ee6da 100644 (file)
--- 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
-                   );
     }
 }
 

diff --git a/src/tag.c b/src/tag.c
index 8f4495ee2c1702db3f7a7d7f84432d1539e830b9..0029fa5fde16c20211b3f17af29ce52c30f05a3e 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -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 4af9aeb8465cc193b5d79540571ce0e47895dbe4..b9af7310102dd2ac8a43143e2ffa4dfe60f3e15e 100644 (file)
--- 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 1045c21ece5242cd33798602d4f204df5fd69ab4..0191775dbf7801445194606f5c36d6272e291ecb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1819,
 /**/
     1818,
 /**/