diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-06-22 06:28:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-06-22 06:28:58 +0200 |
| commit | f506c5bb1c0c191511316b4b9b2e9a5af176d446 (patch) | |
| tree | b01e3afaefbe7db1a7ce9052d68396225053a190 /src/blowfish.c | |
| parent | 7cfea75ed6897c81dc129490dd894b1ddeebf433 (diff) | |
| download | vim-git-f506c5bb1c0c191511316b4b9b2e9a5af176d446.tar.gz | |
Fix compiler warnings for shadowed variables. Make 'conceal' a long instead
of int.
Diffstat (limited to 'src/blowfish.c')
| -rw-r--r-- | src/blowfish.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/blowfish.c b/src/blowfish.c index c8e68d224..78e56991b 100644 --- a/src/blowfish.c +++ b/src/blowfish.c @@ -39,7 +39,7 @@ typedef union { static void bf_e_block __ARGS((UINT32_T *p_xl, UINT32_T *p_xr)); static void bf_e_cblock __ARGS((char_u *block)); -static int bf_check_tables __ARGS((UINT32_T ipa[18], UINT32_T sbi[4][256], UINT32_T val)); +static int bf_check_tables __ARGS((UINT32_T a_ipa[18], UINT32_T a_sbi[4][256], UINT32_T val)); static int bf_self_test __ARGS((void)); /* Blowfish code */ @@ -469,19 +469,19 @@ bf_key_init(password, salt, salt_len) * BF Self test for corrupted tables or instructions */ static int -bf_check_tables(ipa, sbi, val) - UINT32_T ipa[18]; - UINT32_T sbi[4][256]; +bf_check_tables(a_ipa, a_sbi, val) + UINT32_T a_ipa[18]; + UINT32_T a_sbi[4][256]; UINT32_T val; { int i, j; UINT32_T c = 0; for (i = 0; i < 18; i++) - c ^= ipa[i]; + c ^= a_ipa[i]; for (i = 0; i < 4; i++) for (j = 0; j < 256; j++) - c ^= sbi[i][j]; + c ^= a_sbi[i][j]; return c == val; } |