aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1271: compiler warnings for use of STRNCPY()

Browse Source 
Problem:    Compiler warnings for use of STRNCPY(). (John Marriott)
Solution:   Use mch_memmove() instead of STRNCPY().
This commit is contained in:
Bram Moolenaar 2019-05-05 13:02:28 +02:00
parent 9dfa313919
commit b3de6c4a76
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/search.c
View File

@ -1415,10 +1415,10 @@ do_search(
{ {
// Use a space to draw the composing char on. // Use a space to draw the composing char on.
msgbuf[1] = ' '; msgbuf[1] = ' ';
STRNCPY(msgbuf + 2, p, STRLEN(p)); mch_memmove(msgbuf + 2, p, STRLEN(p));
} }
else else
STRNCPY(msgbuf + 1, p, STRLEN(p)); mch_memmove(msgbuf + 1, p, STRLEN(p));
if (spats[0].off.line || spats[0].off.end || spats[0].off.off) if (spats[0].off.line || spats[0].off.end || spats[0].off.off)
{ {
p = msgbuf + STRLEN(p) + 1; p = msgbuf + STRLEN(p) + 1;
@ -5006,7 +5006,7 @@ search_stat(
else else
vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cur, cnt); vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cur, cnt);
} }
STRNCPY(msgbuf + STRLEN(msgbuf) - STRLEN(t), t, STRLEN(t)); mch_memmove(msgbuf + STRLEN(msgbuf) - STRLEN(t), t, STRLEN(t));
if (dirc == '?' && cur == 100) if (dirc == '?' && cur == 100)
cur = -1; cur = -1;

2
src/version.c
View File

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