From: Garrett Wollman <wollman@csail.mit.edu>
Date: Sun, 15 Jul 2012 19:44:42 +0000 (-0400)
Subject: vol: dead initialization in VWalkVolumeHeaders()
X-Git-Tag: upstream/1.8.0_pre1^2~2218
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e319f0ed8bf110d3b614f8e1feca73e6601b4a2d;p=packages%2Fo%2Fopenafs.git

vol: dead initialization in VWalkVolumeHeaders()

Actually, all of the initializers in this small function are dead.

Change-Id: If89fe3222ec39b34233f92f3aafd458f5723b0c5
Reviewed-on: http://gerrit.openafs.org/7771
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/vol/vutil.c b/src/vol/vutil.c
index 007b1ec3a..3407d5aff 100644
--- a/src/vol/vutil.c
+++ b/src/vol/vutil.c
@@ -827,8 +827,8 @@ int
 VWalkVolumeHeaders(struct DiskPartition64 *dp, const char *partpath,
                    VWalkVolFunc volfunc, VWalkErrFunc errfunc, void *rock)
 {
-    DIR *dirp = NULL;
-    struct dirent *dentry = NULL;
+    DIR *dirp;
+    struct dirent *dentry;
     int code = 0;
     struct VolumeDiskHeader diskHeader;
 
@@ -839,8 +839,8 @@ VWalkVolumeHeaders(struct DiskPartition64 *dp, const char *partpath,
 	goto done;
     }
 
-    while ((dentry = readdir(dirp))) {
-	char *p = dentry->d_name;
+    while ((dentry = readdir(dirp)) != NULL) {
+	char *p;
 	p = strrchr(dentry->d_name, '.');
 	if (p != NULL && strcmp(p, VHDREXT) == 0) {
 	    char name[VMAXPATHLEN];