summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-02-25 14:42:45 +0100
committerBram Moolenaar <Bram@vim.org>2011-02-25 14:42:45 +0100
commit2f70a34e2ef12cd6cd76f1d378823c2c745c7402 (patch)
tree1a1708f6eebdb48185df53f3199e57000e32ad36
parent0065402f9a7e1317a58884f4e3588cdc6a8d3b92 (diff)
updated for version 7.3.126v7.3.126
Problem: Compiler warning for signed pointer. Solution: Use unsigned int argument for sscanf().
-rw-r--r--src/blowfish.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/blowfish.c b/src/blowfish.c
index ff84cccebe..573a1da48b 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 c4fe28e150..4a2d62977d 100644
--- 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,