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/memline.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/memline.c')
| -rw-r--r-- | src/memline.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/memline.c b/src/memline.c index 75800b15b..c5b22e092 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1335,16 +1335,16 @@ ml_recover() b0_ff = (b0p->b0_flags & B0_FF_MASK); if (b0p->b0_flags & B0_HAS_FENC) { - int size = B0_FNAME_SIZE_NOCRYPT; + int fnsize = B0_FNAME_SIZE_NOCRYPT; #ifdef FEAT_CRYPT /* Use the same size as in add_b0_fenc(). */ if (b0p->b0_id[1] != BLOCK0_ID1) - size = B0_FNAME_SIZE_CRYPT; + fnsize = B0_FNAME_SIZE_CRYPT; #endif - for (p = b0p->b0_fname + size; p > b0p->b0_fname && p[-1] != NUL; --p) + for (p = b0p->b0_fname + fnsize; p > b0p->b0_fname && p[-1] != NUL; --p) ; - b0_fenc = vim_strnsave(p, (int)(b0p->b0_fname + size - p)); + b0_fenc = vim_strnsave(p, (int)(b0p->b0_fname + fnsize - p)); } mf_put(mfp, hp, FALSE, FALSE); /* release block 0 */ |