From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 25 Feb 2011 13:42:45 +0000 (+0100)
Subject: updated for version 7.3.126
X-Git-Tag: v7.3.126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f70a34e2ef12cd6cd76f1d378823c2c745c7402;p=vim

updated for version 7.3.126
Problem:    Compiler warning for signed pointer.
Solution:   Use unsigned int argument for sscanf().
---

diff --git a/src/blowfish.c b/src/blowfish.c
index ff84ccceb..573a1da48 100644
--- a/src/blowfish.c
+++ b/src/blowfish.c
@@ -413,6 +413,7 @@ bf_key_init(password, salt, salt_len)
     int    salt_len;
 {
     int      i, j, keypos = 0;
+    unsigned u;
     UINT32_T val, data_l, data_r;
     char_u   *key;
     int      keylen;
@@ -432,8 +433,8 @@ bf_key_init(password, salt, salt_len)
     }
     for (i = 0; i < keylen; i++)
     {
-	sscanf((char *)&key[i * 2], "%2x", &j);
-	key[i] = j;
+	sscanf((char *)&key[i * 2], "%2x", &u);
+	key[i] = u;
     }
 
     mch_memmove(sbx, sbi, 4 * 4 * 256);
diff --git a/src/version.c b/src/version.c
index c4fe28e15..4a2d62977 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    126,
 /**/
     125,
 /**/