changeset 2710:2d9eebf2c48f v7.3.126

updated for version 7.3.126 Problem: Compiler warning for signed pointer. Solution: Use unsigned int argument for sscanf().
author Bram Moolenaar <bram@vim.org>
date Fri, 25 Feb 2011 14:42:45 +0100
parents b01a37ab556b
children 0c39ff7a90a8
files src/blowfish.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    126,
+/**/
     125,
 /**/
     124,