From de350399d593c94f456a53f50d2e08a6a0b1d7ae Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 20 Jan 2011 01:45:29 -0500 Subject: [PATCH] vol: fix _namei_examine_reg DELETE_ZLC usage replace 'i' with 'dirl' and assign the new variable a value before using it. Reviewed-on: http://gerrit.openafs.org/3701 Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit 8bb5e291777a0439c7a15262bdbc70d8bd9cc4a6) Change-Id: I9c7bb592516f609174fbf2a7b3bb6b5e0e81ba72 Reviewed-on: http://gerrit.openafs.org/3848 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/vol/namei_ops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c index 526b30245..4e208497f 100644 --- a/src/vol/namei_ops.c +++ b/src/vol/namei_ops.c @@ -1903,7 +1903,7 @@ _namei_examine_special(char * path1, /** * examine a namei file. * - * @param[in] path1 volume special directory path + * @param[in] path3 volume special directory path * @param[in] dname directory entry name * @param[in] myIH inode handle to volume directory * @param[in] linkHandle namei link count fd handle. @@ -1943,7 +1943,7 @@ _namei_examine_reg(char * path3, int ret = 0; struct ViceInodeInfo info; #ifdef DELETE_ZLC - int i; /* Windows-only (one level hash dir) */ + int dirl; /* Windows-only (one level hash dir) */ #endif if (DecodeInode(path3, dname, &info, myIH->ih_vid) < 0) { @@ -1960,7 +1960,8 @@ _namei_examine_reg(char * path3, /* defer -- the AddToZLCDeleteList() interface is not MT-safe */ ret = -2; #else /* !AFS_SALSRV_ENV */ - AddToZLCDeleteList((char)i, dname); + dirl = path3[strlen(path3)-1]; + AddToZLCDeleteList((char)dirl, dname); #endif /* !AFS_SALSRV_ENV */ #else /* !DELETE_ZLC */ Log("Found 0 link count file %s" OS_DIRSEP "%s.\n", path3, -- 2.39.5