# HG changeset patch # User Christian Brabandt # Date 1464899407 -7200 # Node ID 665d10cb3e6b9a1cfb3e8082a6df182adcd3147e # Parent 6a664361561e1484e7023715bf02c40aacee6ab8 commit https://github.com/vim/vim/commit/ea0345901cc2af29f9c5dd0d9d8a818d5f96a63b Author: Bram Moolenaar Date: Thu Jun 2 22:27:08 2016 +0200 patch 7.4.1883 Problem: Cppcheck found 2 incorrect printf formats. Solution: Use %ld and %lx. (Dominique Pelle) diff --git a/src/VisVim/Commands.cpp b/src/VisVim/Commands.cpp --- a/src/VisVim/Commands.cpp +++ b/src/VisVim/Commands.cpp @@ -575,7 +575,7 @@ static BOOL VimOpenFile(BSTR& FileName, 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 --- 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 --- 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,