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
index 111b163c4238efba31affd66f2e67066ac7d1daf..569fbb87dff0c1ab12eb547f10b942ba8ae7a3cc 100644 (file)
--- 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 b3f76af70003a6ab853a9f8374d07e9fd1abf404..8990b0566b6752cff7800dc5a693a48b715d4d6c 100644 (file)
--- 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 5a84b80fdcdf8da268c8710343397c834b19aba4..6278002e902f5121011108761318e459d1238b2e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1883,
 /**/
     1882,
 /**/