From f506c5bb1c0c191511316b4b9b2e9a5af176d446 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 22 Jun 2010 06:28:58 +0200 Subject: Fix compiler warnings for shadowed variables. Make 'conceal' a long instead of int. --- src/memline.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/memline.c') diff --git a/src/memline.c b/src/memline.c index 75800b15bd..c5b22e0924 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 */ -- cgit v1.2.3