unused-vars-20021002

remove (some) unused variables
fix a few compiler warnings
this is part of OpenBSD merge

diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
index e74cd14..105d65a 100644 (file)
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -293,13 +293,12 @@ int afs_Analyze(register struct conn *aconn, afs_int32 acode,
        struct VenusFid *afid, register struct vrequest *areq, int op,
        afs_int32 locktype, struct cell *cellp)
 {
-   afs_int32 i, code;
-   struct srvAddr *sa;
-   struct server *tsp;
-   struct volume *tvp;
-   afs_int32 shouldRetry = 0;
-   struct afs_stats_RPCErrors *aerrP;
-   XSTATS_DECLS;
+    afs_int32 i;
+    struct srvAddr *sa;
+    struct server *tsp;
+    struct volume *tvp;
+    afs_int32 shouldRetry = 0;
+    struct afs_stats_RPCErrors *aerrP;
 
     AFS_STATCNT(afs_Analyze);
     afs_Trace4(afs_iclSetp, CM_TRACE_ANALYZE, ICL_TYPE_INT32, op,

diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c
index 7873c82..d194c5d 100644 (file)
--- a/src/afs/afs_callback.c
+++ b/src/afs/afs_callback.c
@@ -932,7 +932,6 @@ int SRXAFSCB_WhoAreYou(struct rx_call *a_call, struct interfaceAddr *addr)
 {
     int i;
     int code = 0;
-    XSTATS_DECLS;
 
     RX_AFS_GLOCK();
 

diff --git a/src/afs/afs_cell.c b/src/afs/afs_cell.c
index 5f97e4f..76e92dc 100644 (file)
--- a/src/afs/afs_cell.c
+++ b/src/afs/afs_cell.c
@@ -155,7 +155,6 @@ void afs_LookupAFSDB(char *acellName)
 #ifdef AFS_AFSDB_ENV
     afs_int32 cellHosts[MAXCELLHOSTS];
     char *realName = NULL;
-    struct cell *tc;
     int code, timeout;
     
     code = afs_GetCellHostsAFSDB(acellName, cellHosts, &timeout, &realName);
@@ -321,7 +320,7 @@ int afs_cellname_write()
 {
     struct osi_file *tfile;
     struct cell_name *cn;
-    int code, off;
+    int off;
 
     if (!afs_cellname_dirty || !afs_cellname_inode_set)
        return 0;

diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c
index fb3d4e9..175eafd 100644 (file)
--- a/src/afs/afs_daemons.c
+++ b/src/afs/afs_daemons.c
@@ -49,7 +49,7 @@ afs_int32 PROBE_INTERVAL=180; /* default to 3 min */
 #define PROBE_WAIT() (1000 * (PROBE_INTERVAL - ((afs_random() & 0x7fffffff) \
                      % (PROBE_INTERVAL/2))))
 
-int afs_CheckServerDaemon(void)
+void afs_CheckServerDaemon(void)
 {
     afs_int32 now, delay, lastCheck, last10MinCheck;
 

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 89bc71b..f6e1ecb 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -221,7 +221,7 @@ extern void afs_Daemon(void);
 extern struct brequest *afs_BQueue(register short aopcode, register struct vcache *avc, 
         afs_int32 dontwait, afs_int32 ause, struct AFS_UCRED *acred, 
         afs_size_t asparm0, afs_size_t asparm1, void *apparm0);
-extern int afs_CheckServerDaemon(void);
+extern void afs_CheckServerDaemon(void);
 extern int afs_CheckRootVolume (void);
 extern void afs_BRelease(register struct brequest *ab);
 extern int afs_BBusy(void);

diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index 2a2d31c..cea8927 100644 (file)
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -153,7 +153,6 @@ void afs_CheckTokenCache(void)
     register int i;
     register struct unixuser *tu;
     afs_int32 now;
-    register struct cell *tcell;
 
     AFS_STATCNT(afs_CheckCacheResets);
     ObtainReadLock(&afs_xvcache);
@@ -174,10 +173,9 @@ void afs_CheckTokenCache(void)
                     * cache.
                     */
 #ifdef notdef
-                   tcell = afs_GetCell(tu->cell);
                    /* I really hate this message - MLK */
                    afs_warn("afs: Tokens for user of AFS id %d for cell %s expired now\n",
-                          tu->vid, tcell->cellName);
+                          tu->vid, afs_GetCell(tu->cell)->cellName);
 #endif
                    tu->states |= (UTokensBad | UNeedsReset);
                }
@@ -197,7 +195,7 @@ void afs_CheckTokenCache(void)
 
 void afs_ResetAccessCache(afs_int32 uid, int alock)
 {
-    register int i, j;
+    register int i;
     register struct vcache *tvc;
     struct axscache *ac;
 
@@ -226,7 +224,6 @@ void afs_ResetAccessCache(afs_int32 uid, int alock)
 void afs_ResetUserConns (register struct unixuser *auser)
 {
     int i;
-    struct server *ts;
     struct srvAddr *sa;
     struct conn *tc;