diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-23 17:28:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-23 17:28:22 +0200 |
| commit | d4f31dc45482e8db527ca044b9c3436b1e750006 (patch) | |
| tree | 8bfae30d2e48daf3605412b1ab4e3b5cb8460475 | |
| parent | b49edc11a1872fa99befa9a4a8ea6c8537868038 (diff) | |
| download | vim-d4f31dc45482e8db527ca044b9c3436b1e750006.zip | |
patch 7.4.2097
Problem: Warning from 64 bit compiler.
Solution: use size_t instead of int. (Mike Williams)
| -rw-r--r-- | src/message.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/message.c b/src/message.c index c49429d0e..fe68b5bd0 100644 --- a/src/message.c +++ b/src/message.c @@ -237,18 +237,19 @@ msg_strtrunc( trunc_string( char_u *s, char_u *buf, - int room, + int room_in, int buflen) { - int half; - int len; + size_t room = room_in - 3; /* "..." takes 3 chars */ + size_t half; + size_t len = 0; int e; int i; int n; - room -= 3; + if (room_in < 3) + room = 0; half = room / 2; - len = 0; /* First part: Start of the string. */ for (e = 0; len < half && e < buflen; ++e) @@ -320,7 +321,7 @@ trunc_string( if (s != buf) { len = STRLEN(s); - if (len >= buflen) + if (len >= (size_t)buflen) len = buflen - 1; len = len - e + 1; if (len < 1) @@ -333,8 +334,8 @@ trunc_string( { /* set the middle and copy the last part */ mch_memmove(buf + e, "...", (size_t)3); - len = (int)STRLEN(s + i) + 1; - if (len >= buflen - e - 3) + len = STRLEN(s + i) + 1; + if (len >= (size_t)buflen - e - 3) len = buflen - e - 3 - 1; mch_memmove(buf + e + 3, s + i, len); buf[e + 3 + len - 1] = NUL; diff --git a/src/version.c b/src/version.c index f47766b76..d511c5236 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2097, +/**/ 2096, /**/ 2095, |