diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-01 20:03:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-01 20:03:42 +0200 |
| commit | bde9810d6103ffe3a22a9330021cb21db1ed1792 (patch) | |
| tree | 7c995875215cdf9042a1d9a0ddcb1a73f7718fc5 | |
| parent | 22fcfad29276bd5f317faf516637dcd491b96a12 (diff) | |
patch 7.4.1977v7.4.1977
Problem: With 64 bit changes don't need three calls to sprintf().
Solution: Simplify the code, use vim_snprintf(). (Ken Takata)
| -rw-r--r-- | src/fileio.c | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 22 deletions
diff --git a/src/fileio.c b/src/fileio.c index 621281e850..fa927ff349 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5231,17 +5231,8 @@ msg_add_lines( if (insert_space) *p++ = ' '; if (shortmess(SHM_LINES)) -#ifdef LONG_LONG_OFF_T - sprintf((char *)p, - "%ldL, %lldC", lnum, (long long)nchars); -#elif defined(WIN3264) - sprintf((char *)p, - "%ldL, %I64dC", lnum, (__int64)nchars); -#else - sprintf((char *)p, - /* Explicit typecast avoids warning on Mac OS X 10.6 */ - "%ldL, %ldC", lnum, (long)nchars); -#endif + vim_snprintf((char *)p, IOSIZE - (p - IObuff), + "%ldL, %lldC", lnum, (varnumber_T)nchars); else { if (lnum == 1) @@ -5252,17 +5243,8 @@ msg_add_lines( if (nchars == 1) STRCPY(p, _("1 character")); else -#ifdef LONG_LONG_OFF_T - sprintf((char *)p, - _("%lld characters"), (long long)nchars); -#elif defined(WIN3264) - sprintf((char *)p, - _("%I64d characters"), (__int64)nchars); -#else - sprintf((char *)p, - /* Explicit typecast avoids warning on Mac OS X 10.6 */ - _("%ld characters"), (long)nchars); -#endif + vim_snprintf((char *)p, IOSIZE - (p - IObuff), + _("%lld characters"), (varnumber_T)nchars); } } diff --git a/src/version.c b/src/version.c index 78ea040eda..00b88943ce 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 */ /**/ + 1977, +/**/ 1976, /**/ 1975, |