From f4b81576cc0c2c2ef5f2dd31a331fdfc103b3556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eliseo=20Marti=CC=81nez?= Date: Sun, 20 Apr 2014 18:27:12 +0200 Subject: [PATCH] Use portable format specifiers: Case %ld - localized - vim_snprintf_add. Fix uses of localized "%ld" within vim_snprintf_add(): - Replace "%ld" with "%" PRId64. - Cast corresponding argument to (int64_t). --- src/buffer.c | 6 +++--- src/ex_cmds.c | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 8a4323660f..db773a4e09 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2578,9 +2578,9 @@ fileinfo ( (int64_t)curbuf->b_ml.ml_line_count, n); } else { vim_snprintf_add((char *)buffer, IOSIZE, - _("line %ld of %ld --%d%%-- col "), - (long)curwin->w_cursor.lnum, - (long)curbuf->b_ml.ml_line_count, + _("line %" PRId64 " of %" PRId64 " --%d%%-- col "), + (int64_t)curwin->w_cursor.lnum, + (int64_t)curbuf->b_ml.ml_line_count, n); validate_virtcol(); len = STRLEN(buffer); diff --git a/src/ex_cmds.c b/src/ex_cmds.c index e7531eee50..625e7dca31 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -4488,14 +4488,16 @@ do_sub_msg ( "%s", count_only ? _("1 match") : _("1 substitution")); else vim_snprintf_add((char *)msg_buf, sizeof(msg_buf), - count_only ? _("%ld matches") : _("%ld substitutions"), - sub_nsubs); + count_only ? + _("%" PRId64 " matches") : + _("%" PRId64 " substitutions"), + (int64_t)sub_nsubs); if (sub_nlines == 1) vim_snprintf_add((char *)msg_buf, sizeof(msg_buf), "%s", _(" on 1 line")); else vim_snprintf_add((char *)msg_buf, sizeof(msg_buf), - _(" on %ld lines"), (long)sub_nlines); + _(" on %" PRId64 " lines"), (int64_t)sub_nlines); if (msg(msg_buf)) /* save message to display it after redraw */ set_keep_msg(msg_buf, 0);