summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-02 22:27:08 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-02 22:27:08 +0200
commitea0345901cc2af29f9c5dd0d9d8a818d5f96a63b (patch)
treef5c664ef7870dc540b089f9cf88f308f9c999ed2
parentb37662a0fbb952838fca87aff4d26b596030b67b (diff)
patch 7.4.1883v7.4.1883
Problem: Cppcheck found 2 incorrect printf formats. Solution: Use %ld and %lx. (Dominique Pelle)
-rw-r--r--src/VisVim/Commands.cpp2
-rw-r--r--src/gui_mac.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/VisVim/Commands.cpp b/src/VisVim/Commands.cpp
index 111b163c42..569fbb87df 100644
--- a/src/VisVim/Commands.cpp
+++ b/src/VisVim/Commands.cpp
@@ -575,7 +575,7 @@ static BOOL VimOpenFile(BSTR& FileName, long LineNr)
if (LineNr > 0)
{
// Goto line
- sprintf(VimCmd, ":%d\n", LineNr);
+ sprintf(VimCmd, ":%ld\n", LineNr);
if (! VimOle.Method(DispatchId, "s", TO_OLE_STR_BUF(VimCmd, Buf)))
goto OleError;
}
diff --git a/src/gui_mac.c b/src/gui_mac.c
index b3f76af700..8990b0566b 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -5040,7 +5040,7 @@ gui_mch_set_scrollbar_thumb(
SetControl32BitValue (sb->id, val);
SetControlViewSize (sb->id, size);
#ifdef DEBUG_MAC_SB
- printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max);
+ printf("thumb_sb (%x) %lx, %lx,%lx\n",sb->id, val, size, max);
#endif
}
diff --git a/src/version.c b/src/version.c
index 5a84b80fdc..6278002e90 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1883,
+/**/
1882,
/**/
1881,