viced, tviced: Set but not used variables

Remove or ifdef out some variables that are set but never used.

Spotted by gcc 4.6

Change-Id: I895740680997cff29d96ee5257830531c71711af
Reviewed-on: http://gerrit.openafs.org/2853
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/tviced/serialize_state.c b/src/tviced/serialize_state.c
index 654f472..a27cbda 100644 (file)
--- a/src/tviced/serialize_state.c
+++ b/src/tviced/serialize_state.c
@@ -936,9 +936,11 @@ fs_stateSeek(struct fs_dump_state * state, afs_uint64 * offset)
 {
     int ret = 0;
     char * p;
+#ifndef AFS_64BIT_ENV
     afs_uint32 hi, lo;
 
     SplitInt64(*offset, hi, lo);
+#endif
 
     /* update cursor */
     p = (char *) state->mmap.map;

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index f441be0..b876f36 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -4983,7 +4983,6 @@ SAFSS_RemoveDir(struct rx_call *acall, struct AFSFid *DirFid, char *Name,
     Volume *volptr = 0;                /* pointer to the volume header */
     struct client *client = 0; /* pointer to client structure */
     afs_int32 rights, anyrights;       /* rights for this and any user */
-    Vnode debugvnode1, debugvnode2;
     struct client *t_client;   /* tmp ptr to client data */
     struct in_addr logHostAddr;        /* host ip holder for inet_ntoa */
     struct rx_connection *tcon = rx_ConnectionOf(acall);
@@ -5010,7 +5009,6 @@ SAFSS_RemoveDir(struct rx_call *acall, struct AFSFid *DirFid, char *Name,
                          &rights, &anyrights))) {
        goto Bad_RemoveDir;
     }
-    debugvnode1 = *parentptr;
 
     /* set volume synchronization information */
     SetVolumeSync(Sync, volptr);
@@ -5020,7 +5018,6 @@ SAFSS_RemoveDir(struct rx_call *acall, struct AFSFid *DirFid, char *Name,
        goto Bad_RemoveDir;
     }
 
-    debugvnode2 = *parentptr;
     /* Do the actual delete of the desired (empty) directory, Name */
     if ((errorCode =
         DeleteTarget(parentptr, volptr, &targetptr, &dir, &fileFid, Name,

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 58e7764..5555391 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -1003,7 +1003,6 @@ int
 BreakDelayedCallBacks_r(struct host *host)
 {
     struct AFSFid fids[AFSCBMAX];
-    u_byte thead[AFSCBMAX];    /* This should match thead in struct Callback */
     int cbi, first, nfids;
     struct CallBack *cb;
     int code;
@@ -1058,7 +1057,6 @@ BreakDelayedCallBacks_r(struct host *host)
                cbi = cb->hnext;
                if (cb->status == CB_DELAYED) {
                    struct FileEntry *fe = itofe(cb->fhead);
-                   thead[nfids] = cb->thead;
                    fids[nfids].Volume = fe->volid;
                    fids[nfids].Vnode = fe->vnode;
                    fids[nfids].Unique = fe->unique;
@@ -2462,9 +2460,6 @@ cb_stateRestoreCBs(struct fs_dump_state * state, struct FileEntry * fe,
     int ret = 0, idx;
     struct CallBack * cb;
     struct CBDiskEntry * cbdsk;
-    afs_uint32 fei;
-
-    fei = fetoi(fe);
 
     for (idx = 0; idx < niovecs; idx++) {
        cbdsk = (struct CBDiskEntry *) iov[idx].iov_base;

diff --git a/src/viced/fsprobe.c b/src/viced/fsprobe.c
index 7d44b9f..1867791 100644 (file)
--- a/src/viced/fsprobe.c
+++ b/src/viced/fsprobe.c
@@ -63,7 +63,6 @@ main(int argc, char **argv)
     struct sockaddr_in host;
     afs_int32 code;
     struct hostent *hp;
-    char *hostname;
     char hnamebuf[200];
     struct timeval tv;
     int noAuth = 1;            /* Default is authenticated connections */
@@ -81,13 +80,11 @@ main(int argc, char **argv)
 #endif
     if (host.sin_addr.s_addr != -1) {
        strcpy(hnamebuf, av[0]);
-       hostname = hnamebuf;
     } else {
        hp = gethostbyname(av[0]);
        if (hp) {
            host.sin_family = hp->h_addrtype;
            memcpy((caddr_t) & host.sin_addr, hp->h_addr, hp->h_length);
-           hostname = hp->h_name;
        } else {
            printf("unknown server host %s\n", av[0]);
            exit(1);

diff --git a/src/viced/host.c b/src/viced/host.c
index 6847858..c0d5718 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -687,7 +687,6 @@ h_Alloc_r(struct rx_connection *r_con)
 {
     struct servent *serverentry;
     struct host *host;
-    afs_int32 now;
 #if FS_STATS_DETAILED
     afs_uint32 newHostAddr_HBO;        /*New host IP addr, in host byte order */
 #endif /* FS_STATS_DETAILED */
@@ -715,7 +714,7 @@ h_Alloc_r(struct rx_connection *r_con)
     /* Make a callback channel even for the console, on the off chance that it
      * makes a request that causes a break call back.  It shouldn't. */
     h_SetupCallbackConn_r(host);
-    now = host->LastCall = host->cpsCall = host->ActiveCall = FT_ApproxTime();
+    host->LastCall = host->cpsCall = host->ActiveCall = FT_ApproxTime();
     host->hostFlags = 0;
     host->hcps.prlist_val = NULL;
     host->hcps.prlist_len = 0;