From: Derrick Brashear Date: Thu, 22 Aug 2002 19:45:11 +0000 (+0000) Subject: prototypes-fixes-20020821 X-Git-Tag: BP-openafs-rxkad-krb5 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8e66ec5e01c0746822dc13c7679bb0a8febd8579;p=packages%2Fo%2Fopenafs.git prototypes-fixes-20020821 screw it. if winnt can have generic pointers, so can we ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== and cast all the pointers --- diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c index 8b9a34b01..b7e8b23e3 100644 --- a/src/bozo/bnode.c +++ b/src/bozo/bnode.c @@ -737,7 +737,8 @@ int bnode_Init() { LWP_InitializeProcessSupport(1, &junk); /* just in case */ IOMGR_Initialize(); code = LWP_CreateProcess(bproc, BNODE_LWP_STACKSIZE, - /* priority */ 1, /* parm */0, "bnode-manager", &bproc_pid); + /* priority */ 1, (void *) /* parm */0, + "bnode-manager", &bproc_pid); if (code) return code; memset((char *)&newaction, 0, sizeof(newaction)); newaction.sa_handler = bnode_Int; diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c index d894fc3f0..b6ec651d5 100644 --- a/src/bozo/bosserver.c +++ b/src/bozo/bosserver.c @@ -861,7 +861,7 @@ int main (int argc, char **argv, char **envp) } code = LWP_CreateProcess(BozoDaemon, BOZO_LWP_STACKSIZE, /* priority */ 1, - /* parm */0, "bozo-the-clown", &bozo_pid); + (void *) /*parm*/0, "bozo-the-clown", &bozo_pid); /* try to read the key from the config file */ tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH); diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c index a13487e9a..25d97c749 100644 --- a/src/bucoord/dump.c +++ b/src/bucoord/dump.c @@ -303,7 +303,7 @@ bc_StartDmpRst(aconfig, adname, avname, avolsToDump, adestServer, adestPartition memset(&bc_dumpTasks[i].destServer, 0, sizeof(struct sockaddr_in)); code = LWP_CreateProcess(bc_DmpRstStart, 20480, LWP_NORMAL_PRIORITY, - (void *)i, "helper", &junk); + (void *) i, "helper", &junk); if (code) { bc_HandleMisc(code); diff --git a/src/bucoord/main.c b/src/bucoord/main.c index 59269078a..7506bb356 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -278,7 +278,7 @@ static int backupInit() /* setup status monitoring thread */ initStatus(); code = LWP_CreateProcess(statusWatcher, 20480, LWP_NORMAL_PRIORITY, - (void *)2, "statusWatcher", &watcherPid); + (void *) 2, "statusWatcher", &watcherPid); if ( code ) { com_err(whoami, code, "; Can't create status monitor task"); diff --git a/src/butm/test_ftm.c b/src/butm/test_ftm.c index 333f0e14c..8a76a22a4 100644 --- a/src/butm/test_ftm.c +++ b/src/butm/test_ftm.c @@ -171,7 +171,7 @@ main (argc, argv) exit(1); } /* Perform normal test */ - code = LWP_CreateProcess(PerformDumpTest, 100000, 0, &ti , + code = LWP_CreateProcess(PerformDumpTest, 100000, 0, (void *) &ti, "BUTM Tester", &pid); if (code) { com_err(whoami,code,"libbutm.a: Normal Tests failed!. :-( "); @@ -183,7 +183,7 @@ main (argc, argv) /* Perform Appended Test, on tapes */ if (!isafile) { ti.appended = 1; - code = LWP_CreateProcess(PerformDumpTest, 100000, 0, &ti , + code = LWP_CreateProcess(PerformDumpTest, 100000, 0, (void *) &ti, "BUTM Tester", &pid); if (code) { com_err(whoami,code,"libbutm.a: Appended Tests failed!. :-( "); diff --git a/src/fsprobe/fsprobe.c b/src/fsprobe/fsprobe.c index 1027b778b..5b0d95958 100644 --- a/src/fsprobe/fsprobe.c +++ b/src/fsprobe/fsprobe.c @@ -748,7 +748,7 @@ int fsprobe_Init(a_numServers, a_socketArray, a_ProbeFreqInSecs, a_ProbeHandler, LWP_CreateProcess(fsprobe_LWP, /*Function to start up*/ LWP_STACK_SIZE, /*Stack size in bytes*/ 1, /*Priority*/ - 0, /*Parameters*/ + (void *) 0, /*Parameters*/ "fsprobe Worker", /*Name to use*/ &probeLWP_ID); /*Returned LWP process ID*/ if (code) { diff --git a/src/gtx/input.c b/src/gtx/input.c index 8509e5542..faf04b85f 100644 --- a/src/gtx/input.c +++ b/src/gtx/input.c @@ -91,7 +91,7 @@ int astartInput; { IOMGR_Initialize(); /* input thread uses it */ if (astartInput) code = LWP_CreateProcess(gtx_InputServer, 8192, LWP_NORMAL_PRIORITY, - 0, "gx-listener", &junk); + (void *) 0, "gx-listener", &junk); /* all done */ twin = &gator_basegwin; return twin; diff --git a/src/kauth/krb_udp.c b/src/kauth/krb_udp.c index 137cd7dd1..d31e7e416 100644 --- a/src/kauth/krb_udp.c +++ b/src/kauth/krb_udp.c @@ -920,12 +920,12 @@ afs_int32 init_krb_udp () IOMGR_Initialize(); #endif LWP_CreateProcess(SocketListener, /*stacksize*/16000, LWP_NORMAL_PRIORITY, - 0, "Socket Listener", &slPid); + (void *) 0, "Socket Listener", &slPid); /* just to close the log every five minutes */ LWP_CreateProcess(FiveMinuteCheckLWP, 24*1024, - LWP_MAX_PRIORITY - 2, &fiveminutes, + LWP_MAX_PRIORITY - 2, (void *) &fiveminutes, "FiveMinuteChecks", &checkPid); #if MAIN diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c index 5e99925f1..8d9ffc762 100644 --- a/src/lwp/iomgr.c +++ b/src/lwp/iomgr.c @@ -736,8 +736,8 @@ static int SignalSignals (void) for (i=0; i < NSOFTSIG; i++) { PROCESS pid; if (p=sigProc[i]) /* This yields!!! */ - LWP_CreateProcess2(p, stackSize, LWP_NORMAL_PRIORITY, sigRock[i], - "SignalHandler", &pid); + LWP_CreateProcess2(p, stackSize, LWP_NORMAL_PRIORITY, + (void *) sigRock[i], "SignalHandler", &pid); sigProc[i] = 0; } @@ -807,8 +807,8 @@ int IOMGR_Initialize(void) install_ncb_handler(); #endif /* AFS_DJGPP_ENV */ - return LWP_CreateProcess(IOMGR, AFS_LWP_MINSTACKSIZE, 0, 0, "IO MANAGER", - &IOMGR_Id); + return LWP_CreateProcess(IOMGR, AFS_LWP_MINSTACKSIZE, 0, (void *) 0, + "IO MANAGER", &IOMGR_Id); } int IOMGR_Finalize() diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c index a92369680..92dde13f1 100644 --- a/src/lwp/lwp.c +++ b/src/lwp/lwp.c @@ -255,7 +255,7 @@ char *reserveFromStack(register afs_int32 size) #endif int LWP_CreateProcess(int (*ep)(), int stacksize, int priority, - char *parm, char *name, PROCESS *pid) + void *parm, char *name, PROCESS *pid) { PROCESS temp, temp2; #ifdef AFS_AIX32_ENV @@ -384,7 +384,7 @@ int LWP_CreateProcess(int (*ep)(), int stacksize, int priority, #ifdef AFS_AIX32_ENV int LWP_CreateProcess2(int (*ep)(), int stacksize, int priority, - char *parm, char *name, PROCESS *pid) + void *parm, char *name, PROCESS *pid) { PROCESS temp, temp2; char *stackptr; @@ -908,7 +908,7 @@ static void Free_PCB(PROCESS pid) } static void Initialize_PCB(PROCESS temp, int priority, char *stack, - int stacksize, int (*ep)(), char *parm, char *name) + int stacksize, int (*ep)(), void *parm, char *name) { register int i = 0; @@ -1248,7 +1248,7 @@ static int lwp_top_level(pthread_addr_t argp) } int LWP_CreateProcess(pthread_startroutine_t ep, int stacksize, int priority, - char *parm, char *name, PROCESS *pid) + void *parm, char *name, PROCESS *pid) { int status; pthread_attr_t attr; diff --git a/src/lwp/lwp.h b/src/lwp/lwp.h index 89499e7a8..d1a43f37c 100644 --- a/src/lwp/lwp.h +++ b/src/lwp/lwp.h @@ -372,7 +372,7 @@ extern int LWP_CurrentProcess(PROCESS *pid); extern int LWP_INTERNALSIGNAL(char *event, int yield); extern int LWP_InitializeProcessSupport(int priority, PROCESS *pid); extern int LWP_CreateProcess(int (*ep)(), int stacksize, int priority, - char *parm, char *name, PROCESS *pid); + void *parm, char *name, PROCESS *pid); extern int LWP_DestroyProcess(PROCESS pid); extern int LWP_WaitProcess(char *event); extern PROCESS LWP_ThreadId(void); diff --git a/src/rx/rx_lwp.c b/src/rx/rx_lwp.c index 33f75885c..f314f5139 100644 --- a/src/rx/rx_lwp.c +++ b/src/rx/rx_lwp.c @@ -109,7 +109,7 @@ void rxi_StartServerProc(void (*proc)(void), int stacksize) sprintf(name, "srv_%d", ++number); LWP_CreateProcess(proc, stacksize, RX_PROCESS_PRIORITY, - 0, "rx_ServerProc", &scratchPid); + (void *) 0, "rx_ServerProc", &scratchPid); if (registerProgram) (*registerProgram)(scratchPid, name); } @@ -118,8 +118,8 @@ void rxi_StartListener(void) { /* Priority of listener should be high, so it can keep conns alive */ #define RX_LIST_STACK 24000 - LWP_CreateProcess(rx_ListenerProc, RX_LIST_STACK, LWP_MAX_PRIORITY, 0, - "rx_Listener", &rx_listenerPid); + LWP_CreateProcess(rx_ListenerProc, RX_LIST_STACK, LWP_MAX_PRIORITY, + (void *) 0, "rx_Listener", &rx_listenerPid); if (registerProgram) (*registerProgram)(rx_listenerPid, "listener"); } diff --git a/src/scout/scout.c b/src/scout/scout.c index 8d62a764a..5a00923f8 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -2011,7 +2011,7 @@ static int execute_scout(a_numservers, a_srvname, a_pkg) LWP_CreateProcess(gtx_InputServer, /*Fcn to start up*/ 8192, /*Stack size in bytes*/ LWP_NORMAL_PRIORITY, /*Priority*/ - scout_gwin, /*Params: Ptr to window*/ + (void *) scout_gwin, /*Params: Ptr to window*/ "gx-listener", /*Name to use*/ &gxlistener_ID); /*Returned LWP process ID*/ #endif /* 0 */ diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index 0132470bb..4573b68b1 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -281,7 +281,7 @@ int ubik_ServerInitCommon(myHost, myPort, info, clones, serverList, pathName, db * the "steplock" problem in ubik initialization. Defect 11037. */ LWP_CreateProcess(rx_ServerProc, rx_stackSize, RX_PROCESS_PRIORITY, - 0, "rx_ServerProc", &junk); + (void *) 0, "rx_ServerProc", &junk); /* do basic initialization */ code = uvote_Init(); @@ -296,10 +296,10 @@ int ubik_ServerInitCommon(myHost, myPort, info, clones, serverList, pathName, db /* now start up async processes */ code = LWP_CreateProcess(ubeacon_Interact, 16384/*8192*/, LWP_MAX_PRIORITY-1, - 0, "beacon", &junk); + (void *) 0, "beacon", &junk); if (code) return code; code = LWP_CreateProcess(urecovery_Interact, 16384/*8192*/, LWP_MAX_PRIORITY-1, - 0, "recovery", &junk); + (void *) 0, "recovery", &junk); return code; } diff --git a/src/viced/viced.c b/src/viced/viced.c index bb4ee2109..2298da1d6 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -586,10 +586,10 @@ main(argc, argv) AFS_SIGSET_RESTORE(); #else /* AFS_PTHREAD_ENV */ assert(LWP_CreateProcess(FiveMinuteCheckLWP, stack*1024, LWP_MAX_PRIORITY - 2, - &fiveminutes, "FiveMinuteChecks", &serverPid) == LWP_SUCCESS); + (void *) &fiveminutes, "FiveMinuteChecks", &serverPid) == LWP_SUCCESS); assert(LWP_CreateProcess(HostCheckLWP, stack*1024, LWP_MAX_PRIORITY - 2, - &fiveminutes, "HostCheck", &serverPid) == LWP_SUCCESS); + (void *) &fiveminutes, "HostCheck", &serverPid) == LWP_SUCCESS); #endif /* AFS_PTHREAD_ENV */ TM_GetTimeOfDay(&tp, 0); diff --git a/src/vol/fssync.c b/src/vol/fssync.c index 2c82aab33..d833bff3d 100644 --- a/src/vol/fssync.c +++ b/src/vol/fssync.c @@ -233,7 +233,7 @@ void FSYNC_fsInit(void) #else /* AFS_PTHREAD_ENV */ PROCESS pid; assert (LWP_CreateProcess(FSYNC_sync, USUAL_STACK_SIZE, - USUAL_PRIORITY, 0, + USUAL_PRIORITY, (void *) 0, "FSYNC_sync", &pid) == LWP_SUCCESS); #endif /* AFS_PTHREAD_ENV */ } diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 2359b1794..eb197e21b 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -355,8 +355,8 @@ usage: SetupLogSignals(); /* create the lwp to garbage-collect old transactions and sleep periodically */ - LWP_CreateProcess(BKGLoop, 16*1024, 3, 0, "vol bkg daemon", &pid); - LWP_CreateProcess(BKGSleep,16*1024, 3, 0, "vol slp daemon", &pid); + LWP_CreateProcess(BKGLoop, 16*1024, 3, (void *) 0, "vol bkg daemon", &pid); + LWP_CreateProcess(BKGSleep,16*1024, 3, (void *) 0, "vol slp daemon", &pid); /* Create a single security object, in this case the null security object, for unauthenticated connections, which will be used to control security on connections made to this server */ diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c index 25cfca480..6a571bf53 100644 --- a/src/xstat/xstat_cm.c +++ b/src/xstat/xstat_cm.c @@ -613,7 +613,7 @@ int xstat_cm_Init(a_numServers, a_socketArray, a_ProbeFreqInSecs, LWP_CreateProcess(xstat_cm_LWP, /*Function to start up*/ LWP_STACK_SIZE, /*Stack size in bytes*/ 1, /*Priority*/ - 0, /*Parameters*/ + (void *) 0, /*Parameters*/ "xstat_cm Worker", /*Name to use*/ &probeLWP_ID); /*Returned LWP process ID*/ if (code) { diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c index 3318551e3..178df2dd6 100644 --- a/src/xstat/xstat_fs.c +++ b/src/xstat/xstat_fs.c @@ -709,7 +709,7 @@ int xstat_fs_Init(a_numServers, a_socketArray, a_ProbeFreqInSecs, a_ProbeHandler LWP_CreateProcess(xstat_fs_LWP, /*Function to start up*/ LWP_STACK_SIZE, /*Stack size in bytes*/ 1, /*Priority*/ - 0, /*Parameters*/ + (void *) 0, /*Parameters*/ "xstat_fs Worker", /*Name to use*/ &probeLWP_ID); /*Returned LWP process ID*/ if (code) {