]>
Commit | Line | Data |
---|---|---|
7fd9e930 ER |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.126 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.126 | |
11 | Problem: Compiler warning for signed pointer. | |
12 | Solution: Use unsigned int argument for sscanf(). | |
13 | Files: src/blowfish.c | |
14 | ||
15 | ||
16 | *** ../vim-7.3.125/src/blowfish.c 2010-08-15 21:57:28.000000000 +0200 | |
17 | --- src/blowfish.c 2010-12-17 19:58:18.000000000 +0100 | |
18 | *************** | |
19 | *** 413,418 **** | |
20 | --- 413,419 ---- | |
21 | int salt_len; | |
22 | { | |
23 | int i, j, keypos = 0; | |
24 | + unsigned u; | |
25 | UINT32_T val, data_l, data_r; | |
26 | char_u *key; | |
27 | int keylen; | |
28 | *************** | |
29 | *** 432,439 **** | |
30 | } | |
31 | for (i = 0; i < keylen; i++) | |
32 | { | |
33 | ! sscanf((char *)&key[i * 2], "%2x", &j); | |
34 | ! key[i] = j; | |
35 | } | |
36 | ||
37 | mch_memmove(sbx, sbi, 4 * 4 * 256); | |
38 | --- 433,440 ---- | |
39 | } | |
40 | for (i = 0; i < keylen; i++) | |
41 | { | |
42 | ! sscanf((char *)&key[i * 2], "%2x", &u); | |
43 | ! key[i] = u; | |
44 | } | |
45 | ||
46 | mch_memmove(sbx, sbi, 4 * 4 * 256); | |
47 | *** ../vim-7.3.125/src/version.c 2011-02-15 18:06:11.000000000 +0100 | |
48 | --- src/version.c 2011-02-25 14:40:22.000000000 +0100 | |
49 | *************** | |
50 | *** 716,717 **** | |
51 | --- 716,719 ---- | |
52 | { /* Add new patch number below this line */ | |
53 | + /**/ | |
54 | + 126, | |
55 | /**/ | |
56 | ||
57 | -- | |
58 | Why doesn't Tarzan have a beard? | |
59 | ||
60 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
61 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
62 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
63 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |