Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix clang/OS X warnings about embedded directives within macro arguments to sprintf #788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix clang/OS X warnings about embedded directives within macro arguments to sprintf #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/fileio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5230,14 +5230,17 @@ msg_add_lines(
if (insert_space)
*p++ = ' ';
if (shortmess(SHM_LINES))
sprintf((char *)p,

#ifdef LONG_LONG_OFF_T
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
#endif
);
#endif
else
{
if (lnum == 1)
Expand All @@ -5248,14 +5251,16 @@ msg_add_lines(
if (nchars == 1)
STRCPY(p, _("1 character"));
else
sprintf((char *)p,
#ifdef LONG_LONG_OFF_T
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
#endif
);
#endif
}
}

Expand Down
11 changes: 9 additions & 2 deletions src/tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,13 +2293,20 @@ find_tags(
p[len] = '@';
STRCPY(p + len + 1, help_lang);
#endif


#ifdef FEAT_MULTI_LANG
sprintf((char *)p + len + 1 + ML_EXTRA, "%06d",
help_heuristic(tagp.tagname,
match_re ? matchoff : 0, !match_no_ic)
#ifdef FEAT_MULTI_LANG
+ help_pri
#endif
);
#else
sprintf((char *)p + len + 1 + ML_EXTRA, "%06d",
help_heuristic(tagp.tagname,
match_re ? matchoff : 0, !match_no_ic)
);
#endif
}
*tagp.tagname_end = TAB;
}
Expand Down
8 changes: 6 additions & 2 deletions src/term.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2630,15 +2630,19 @@ term_color(char_u *s, int n)
|| STRCMP(s + i + 1, "%dm") == 0)
&& (s[i] == '3' || s[i] == '4'))
{
sprintf(buf,
#ifdef TERMINFO
sprintf(buf,
"%s%s%%p1%%dm",
i == 2 ? IF_EB("\033[", ESC_STR "[") : "\233",
s[i] == '3' ? (n >= 16 ? "38;5;" : "9")
: (n >= 16 ? "48;5;" : "10"));
#else
sprintf(buf,
"%s%s%%dm",
#endif
i == 2 ? IF_EB("\033[", ESC_STR "[") : "\233",
s[i] == '3' ? (n >= 16 ? "38;5;" : "9")
: (n >= 16 ? "48;5;" : "10"));
#endif
OUT_STR(tgoto(buf, 0, n >= 16 ? n : n - 8));
}
else
Expand Down