Unused variable cleanup

[openafs.git] / src / viced / viced.c

diff --git a/src/viced/viced.c b/src/viced/viced.c
index e87f6a4..339f326 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -21,8 +21,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -78,6 +76,7 @@ RCSID
 #include <afs/ptuser.h>
 #include <afs/audit.h>
 #include <afs/partition.h>
+#include <afs/dir.h>
 #ifndef AFS_NT40_ENV
 #include <afs/netutils.h>
 #endif
@@ -92,6 +91,7 @@ RCSID
 #include "sys/lock.h"
 #endif
 #include <rx/rx_globals.h>
+#include <rx/rxstat_prototypes.h>
 
 #ifdef O_LARGEFILE
 #define afs_stat       stat64
@@ -105,20 +105,20 @@ RCSID
 #define afs_fopen      fopen
 #endif /* !O_LARGEFILE */
 
-extern int BreakVolumeCallBacks(), InitCallBack();
-extern int BreakVolumeCallBacks(), InitCallBack(), BreakLaterCallBacks();
-extern int BreakVolumeCallBacksLater();
-extern int LogLevel, etext;
-extern afs_int32 BlocksSpare, PctSpare;
+extern int etext;
 
 void *ShutDown(void *);
-static void ClearXStatValues(), NewParms(), PrintCounters();
-static void ResetCheckDescriptors(void), ResetCheckSignal(void);
+static void ClearXStatValues(void);
+static void NewParms(int);
+static void PrintCounters(void);
+static void ResetCheckDescriptors(void);
+static void ResetCheckSignal(void);
 static void *CheckSignal(void *);
-extern int GetKeysFromToken();
-extern int RXAFS_ExecuteRequest();
-extern int RXSTATS_ExecuteRequest();
-afs_int32 Do_VLRegisterRPC();
+
+extern int RXAFS_ExecuteRequest(struct rx_call *);
+extern int RXSTATS_ExecuteRequest(struct rx_call *);
+
+static afs_int32 Do_VLRegisterRPC(void);
 
 int eventlog = 0, rxlog = 0;
 FILE *debugFile;
@@ -217,7 +217,7 @@ afs_uint32 FS_HostAddrs[ADDRSPERSITE], FS_HostAddr_cnt = 0, FS_registered = 0;
 /* All addresses in FS_HostAddrs are in NBO */
 afsUUID FS_HostUUID;
 
-static void FlagMsg();
+static void FlagMsg(void);
 
 #ifdef AFS_DEMAND_ATTACH_FS
 /*
@@ -274,37 +274,37 @@ CheckDescriptors(void *unused)
 
 #ifdef AFS_PTHREAD_ENV
 void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
 {
     CheckSignal(NULL);
 }
 
 void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
 {
     ShutDown(NULL);
 }
 
 void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
 {
     CheckDescriptors(NULL);
 }
 #else /* AFS_PTHREAD_ENV */
 void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
 {
     IOMGR_SoftSig(CheckSignal, 0);
 }
 
 void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
 {
     IOMGR_SoftSig(ShutDown, 0);
 }
 
 void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
 {
     IOMGR_SoftSig(CheckDescriptors, 0);
 }
@@ -352,16 +352,16 @@ ResetCheckDescriptors(void)
 }
 
 #if defined(AFS_PTHREAD_ENV)
-int *
+int
 threadNum(void)
 {
-    return pthread_getspecific(rx_thread_id_key);
+    return (int)pthread_getspecific(rx_thread_id_key);
 }
 #endif
 
 /* proc called by rxkad module to get a key */
 static int
-get_key(char *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey)
+get_key(void *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey)
 {
     /* find the key */
     static struct afsconf_key tkey;
@@ -378,7 +378,6 @@ get_key(char *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey)
     }
     memcpy(akey, tkey.key, sizeof(tkey.key));
     return 0;
-
 }                              /*get_key */
 
 #ifndef AFS_NT40_ENV
@@ -386,10 +385,10 @@ int
 viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
 {
     afs_uint32 rcode;
-    void (*old) ();
-
 #ifndef AFS_LINUX20_ENV
-    old = (void (*)())signal(SIGSYS, SIG_IGN);
+    void (*old) (int);
+
+    old = (void (*)(int))signal(SIGSYS, SIG_IGN);
 #endif
     rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5);
 #ifndef AFS_LINUX20_ENV
@@ -408,7 +407,7 @@ viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
 char adminName[MAXADMINNAME];
 
 static void
-CheckAdminName()
+CheckAdminName(void)
 {
     int fd = 0;
     struct afs_stat status;
@@ -655,7 +654,7 @@ FsyncCheckLWP(void *unused)
  *------------------------------------------------------------------------*/
 
 static void
-ClearXStatValues()
+ClearXStatValues(void)
 {                              /*ClearXStatValues */
 
     struct fs_stats_opTimingData *opTimeP;     /*Ptr to timing struct */
@@ -706,7 +705,7 @@ int CopyOnWrite_calls = 0, CopyOnWrite_off0 = 0, CopyOnWrite_size0 = 0;
 afs_fsize_t CopyOnWrite_maxsize = 0;
 
 static void
-PrintCounters()
+PrintCounters(void)
 {
     int dirbuff, dircall, dirio;
     struct timeval tpl;
@@ -732,6 +731,7 @@ PrintCounters()
            ("With %d directory buffers; %d reads resulted in %d read I/Os\n",
             dirbuff, dircall, dirio));
     rx_PrintStats(stderr);
+    audit_PrintStats(stderr);
     h_PrintStats();
     PrintCallBackStats();
 #ifdef AFS_NT40_ENV
@@ -873,12 +873,13 @@ ShutDown(void *unused)
 
 
 static void
-FlagMsg()
+FlagMsg(void)
 {
     /* default supports help flag */
 
     fputs("Usage: fileserver ", stdout);
     fputs("[-auditlog <log path>] ", stdout);
+    fputs("[-audit-interface <file|sysvmq> (default is file)] ", stdout);
     fputs("[-d <debug level>] ", stdout);
     fputs("[-p <number of processes>] ", stdout);
     fputs("[-spare <number of spare blocks>] ", stdout);
@@ -1044,6 +1045,7 @@ ParseArgs(int argc, char *argv[])
     int Sawbusy = 0;
     int i;
     int bufSize = 0;           /* temp variable to read in udp socket buf size */
+    char *auditFileName = NULL;
 
     for (i = 1; i < argc; i++) {
        if (!strcmp(argv[i], "-d")) {
@@ -1294,7 +1296,7 @@ ParseArgs(int argc, char *argv[])
            rxMaxMTU = atoi(argv[++i]);
            if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || 
                (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
-               printf("rxMaxMTU %d%% invalid; must be between %d-%d\n",
+               printf("rxMaxMTU %d%% invalid; must be between %d-%lu\n",
                       rxMaxMTU, RX_MIN_PACKET_SIZE, 
                       RX_MAX_PACKET_DATA_SIZE);
                return -1;
@@ -1351,9 +1353,15 @@ ParseArgs(int argc, char *argv[])
            rx_enableProcessRPCStats();
        }
        else if (strcmp(argv[i], "-auditlog") == 0) {
-           char *fileName = argv[++i];
+           auditFileName = argv[++i];
+       }
+       else if (strcmp(argv[i], "-audit-interface") == 0) {
+           char *interface = argv[++i];
 
-            osi_audit_file(fileName);
+           if (osi_audit_interface(interface)) {
+               printf("Invalid audit interface '%s'\n", interface);
+               return -1;
+           }
        }
 #ifndef AFS_NT40_ENV
        else if (strcmp(argv[i], "-syslog") == 0) {
@@ -1413,6 +1421,8 @@ ParseArgs(int argc, char *argv[])
     }
     if (!Sawbusy)
        busy_threshold = 3 * rxpackets / 2;
+    if (auditFileName)
+       osi_audit_file(auditFileName);
 
     return (0);
 
@@ -1499,7 +1509,7 @@ Die(char *msg)
 
 
 afs_int32
-InitPR()
+InitPR(void)
 {
     int code;
 
@@ -1597,7 +1607,7 @@ vl_Initialize(const char *confDir)
 #define SYSIDVERSION   1
 
 afs_int32
-ReadSysIdFile()
+ReadSysIdFile(void)
 {
     afs_int32 fd, nentries, i;
     struct versionStamp vsn;
@@ -1679,7 +1689,7 @@ ReadSysIdFile()
 }
 
 afs_int32
-WriteSysIdFile()
+WriteSysIdFile(void)
 {
     afs_int32 fd, i;
     struct versionStamp vsn;
@@ -1747,12 +1757,11 @@ WriteSysIdFile()
  * and so we need to convert each of them into HBO which is what the extra 
  * array called FS_HostAddrs_HBO is used here.
  */
-afs_int32
-Do_VLRegisterRPC()
+static afs_int32
+Do_VLRegisterRPC(void)
 {
     register int code;
     bulkaddrs addrs;
-    extern int VL_RegisterAddrs();
     afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
     int i = 0;
 
@@ -1786,11 +1795,9 @@ Do_VLRegisterRPC()
 }
 
 afs_int32
-SetupVL()
+SetupVL(void)
 {
     afs_int32 code;
-    extern int rxi_numNetAddrs;
-    extern afs_uint32 rxi_NetAddrs[];
 
     if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || AFSDIR_SERVER_NETINFO_FILEPATH) {
        /*
@@ -1821,7 +1828,7 @@ SetupVL()
 }
 
 afs_int32
-InitVL()
+InitVL(void)
 {
     afs_int32 code;