From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Fri, 10 Sep 2010 23:55:39 +0000 (-0400)
Subject: vlserver: Set but not used variables
X-Git-Tag: openafs-devel-1_5_78~142
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cb978ebcb68bf490e86e0f93de48b6119bae39ed;p=packages%2Fo%2Fopenafs.git

vlserver: Set but not used variables

Remove some variables that are set but never used in the vlserver
directory:
- n1,n2,n3 and n4 in vlclient.c appear to have never been used even
in the original IBM code
- some variables in vldb_check.c that are no longer used after some
recent changes

Spotted by gcc 4.6

Change-Id: Icd9e7da151b3a485c917ed5bd99eb26998dfa818
Reviewed-on: http://gerrit.openafs.org/2784
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit ee3538218d342bb74ab849763421b9ec075251b3)
Reviewed-on: http://gerrit.openafs.org/2800
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index e327a1bd0..f2155ea1a 100644
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -436,8 +436,6 @@ handleit(struct cmd_syndesc *as, void *arock)
 		    ("Volumes not found in main hash tables in vldb will be fixed...\n");
 		memset(&updateentry, 0, sizeof(updateentry));
 		for (index = 0; 1; index = next_index) {
-		    /* FIXME: n2 is never changed for some reason */
-		    int n1 = 0, n2 = 0, n3 = 0, n4 = 0;
 		    memset(&entry, 0, sizeof(entry));
 		    code =
 			ubik_VL_ListEntry(cstruct, 0, index, &count,
@@ -454,7 +452,6 @@ handleit(struct cmd_syndesc *as, void *arock)
 				  &tentry);
 		    if (code == VL_NOENT) {
 			num1++;
-			n1 = 1;
 			updateentry.Mask = VLUPDATE_VOLNAMEHASH;
 			printf("\tVolume %s %d (not in namehash)\n",
 			       entry.name, entry.volumeId[RWVOL]);
@@ -488,13 +485,12 @@ handleit(struct cmd_syndesc *as, void *arock)
 			}
 			x++;
 		    }
-		    if (entry.volumeId[BACKVOL] && !n2) {
+		    if (entry.volumeId[BACKVOL]) {
 			code =
 			    ubik_VL_GetEntryByID(cstruct, 0,
 				      entry.volumeId[BACKVOL], BACKVOL,
 				      &tentry);
 			if (code == VL_NOENT) {
-			    n3 = 1;
 			    num1++;
 			    updateentry.Mask = VLUPDATE_BACKUPID;
 			    updateentry.BackupId = entry.volumeId[BACKVOL];
@@ -512,12 +508,11 @@ handleit(struct cmd_syndesc *as, void *arock)
 			    }
 			}
 		    }
-		    if (entry.volumeId[ROVOL && !n2]) {
+		    if (entry.volumeId[ROVOL]) {
 			code =
 			    ubik_VL_GetEntryByID(cstruct, 0,
 				      entry.volumeId[ROVOL], ROVOL, &tentry);
 			if (code == VL_NOENT) {
-			    n4 = 1;
 			    num1++;
 			    updateentry.Mask = VLUPDATE_READONLYID;
 			    updateentry.ReadOnlyId = entry.volumeId[ROVOL];
diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c
index e141feb66..01645ae85 100644
--- a/src/vlserver/vldb_check.c
+++ b/src/vlserver/vldb_check.c
@@ -1219,11 +1219,8 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
     if (verbose)
 	quiet_println("Verify each volume entry\n");
     for (i = 0; i < maxentries; i++) {
-	int nextp = 0;
-	int reft = 0;
 	int hash = 0;
         int nexthash = 0;
-	afs_uint32 *nextpp = NULL;
 	char *which = NULL;
 
 	if (record[i].type == 0)
@@ -1244,40 +1241,28 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 		       vlentry.name, record[i].addr);
 
 	    if (!(record[i].type & NH)) {
-		nextp = ADDR(vlentry.nextNameHash);
-		reft = REFN;
 		hash = NameHash(vlentry.name);
-		nextpp = &vlentry.nextNameHash;
 		which = "name";
 		volidbuf[0]='\0';
 		foundbad = 1;
 	    }
 
 	    if (vlentry.volumeId[0] && !(record[i].type & RWH)) {
-		nextp = ADDR(vlentry.nextIdHash[0]);
-		reft = REFRW;
 		hash = IdHash(vlentry.volumeId[0]);
-		nextpp = &(vlentry.nextIdHash[0]);
 		which = "RW";
 		sprintf(volidbuf, "id %u ", vlentry.volumeId[0]);
 		foundbad = 1;
 	    }
 
 	    if (vlentry.volumeId[1] && !(record[i].type & ROH)) {
-		nextp = ADDR(vlentry.nextIdHash[1]);
-		reft = REFRO;
 		hash = IdHash(vlentry.volumeId[1]);
-		nextpp = &(vlentry.nextIdHash[1]);
 		which = "RO";
 		sprintf(volidbuf, "id %u ", vlentry.volumeId[1]);
 		foundbad = 1;
 	    }
 
 	    if (vlentry.volumeId[2] && !(record[i].type & BKH)) {
-		nextp = ADDR(vlentry.nextIdHash[2]);
-		reft = REFBK;
 		hash = IdHash(vlentry.volumeId[2]);
-		nextpp = &(vlentry.nextIdHash[2]);
 		which = "BK";
 		sprintf(volidbuf, "id %u ", vlentry.volumeId[2]);
 		foundbad = 1;
@@ -1285,10 +1270,7 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 
 	    if (!validVolumeAddr(vlentry.nextNameHash) ||
 		record[ADDR(vlentry.nextNameHash)].type & MULTN) {
-		nextp = ADDR(vlentry.nextNameHash);
-		reft = REFN;
 		hash = NameHash(vlentry.name);
-		nextpp = &vlentry.nextNameHash;
 		which = "name";
 		volidbuf[0]='\0';
 		if (validVolumeAddr(vlentry.nextNameHash)) {
@@ -1303,10 +1285,7 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 
 	    if (!validVolumeAddr(vlentry.nextIdHash[0]) ||
 		record[ADDR(vlentry.nextIdHash[0])].type & MULTRW) {
-		nextp = ADDR(vlentry.nextIdHash[0]);
-		reft = REFRW;
 		hash = IdHash(vlentry.volumeId[0]);
-		nextpp = &(vlentry.nextIdHash[0]);
 		which = "RW";
 		sprintf(volidbuf, "id %u ", vlentry.volumeId[0]);
 		if (validVolumeAddr(vlentry.nextIdHash[0])) {
@@ -1321,10 +1300,7 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 
 	    if (!validVolumeAddr(vlentry.nextIdHash[1]) ||
 		record[ADDR(vlentry.nextIdHash[1])].type & MULTRO) {
-		nextp = ADDR(vlentry.nextIdHash[1]);
-		reft = REFRO;
 		hash = IdHash(vlentry.volumeId[1]);
-		nextpp = &(vlentry.nextIdHash[1]);
 		which = "RO";
 		sprintf(volidbuf, "id %u ", vlentry.volumeId[1]);
 		if (validVolumeAddr(vlentry.nextIdHash[1])) {
@@ -1339,10 +1315,7 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 
 	    if (!validVolumeAddr(vlentry.nextIdHash[2]) ||
 		record[ADDR(vlentry.nextIdHash[2])].type & MULTBK) {
-		nextp = ADDR(vlentry.nextIdHash[2]);
-		reft = REFBK;
 		hash = IdHash(vlentry.volumeId[2]);
-		nextpp = &(vlentry.nextIdHash[2]);
 		which = "BK";
 		sprintf(volidbuf, "id %u ", vlentry.volumeId[2]);
 		if (validVolumeAddr(vlentry.nextIdHash[2])) {