diff options
Diffstat (limited to 'src/usr/initservice/istepdispatcher')
5 files changed, 32 insertions, 33 deletions
diff --git a/src/usr/initservice/istepdispatcher/istepWorker.C b/src/usr/initservice/istepdispatcher/istepWorker.C index f67235d1b..fc625c694 100644 --- a/src/usr/initservice/istepdispatcher/istepWorker.C +++ b/src/usr/initservice/istepdispatcher/istepWorker.C @@ -60,7 +60,7 @@ extern trace_desc_t *g_trac_initsvc; // ---------------------------------------------------------------------------- // startIStepWorkerThread // ---------------------------------------------------------------------------- -void startIStepWorkerThread ( void * io_args ) +void* startIStepWorkerThread ( void * io_args ) { TRACFCOMP( g_trac_initsvc, ENTER_MRK"startIStepWorkerThread()" ); @@ -75,7 +75,7 @@ void startIStepWorkerThread ( void * io_args ) EXIT_MRK"startIStepWorkerThread()" ); // Shutdown. - task_end(); + return NULL; } diff --git a/src/usr/initservice/istepdispatcher/istepWorker.H b/src/usr/initservice/istepdispatcher/istepWorker.H index f9ed47e24..87f8c8468 100644 --- a/src/usr/initservice/istepdispatcher/istepWorker.H +++ b/src/usr/initservice/istepdispatcher/istepWorker.H @@ -46,9 +46,9 @@ namespace INITSERVICE * @param[in/out] io_args - This is a void pointer, but the code expects that * this will be the msg queue to communicate with the main thread. * -* @return NONE. +* @return NULL */ -void startIStepWorkerThread ( void * io_args ); +void* startIStepWorkerThread ( void * io_args ); /** * @brief This function is the main loop for the Istep dispatcher worker @@ -56,7 +56,7 @@ void startIStepWorkerThread ( void * io_args ); * * @param[in] i_msgQ - The message queue to talk to the main thread. * -* @return NONE. +* @return any errlogs */ void iStepWorkerThread ( void * i_msgQ ); diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index ddd3aeeda..5dc4b7547 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -217,7 +217,7 @@ void IStepDispatcher::init ( errlHndl_t &io_rtaskRetErrl ) TRACFCOMP( g_trac_initsvc, "IStepDispatcher finished."); printk( "IStepDispatcher exit.\n" ); - task_end2( err ); + io_rtaskRetErrl= err; } diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.H b/src/usr/initservice/istepdispatcher/istepdispatcher.H index ddbec0ffb..b3eba4c67 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.H +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/initservice/istepdispatcher/istepdispatcher.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2011-2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/initservice/istepdispatcher/istepdispatcher.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #ifndef __ISTEPDISPATCHER_ISTEPDISPATCHER_H #define __ISTEPDISPATCHER_ISTEPDISPATCHER_H /** @@ -70,9 +69,9 @@ namespace INITSERVICE * * param[in,out] - pointer to any args * - * @return nothing + * @return NULL */ -void spTask ( void *io_pArgs ); +void* spTask ( void *io_pArgs ); /** * @brief enums for whether the messages IStepdispatcher sends are synchronus diff --git a/src/usr/initservice/istepdispatcher/sptask.C b/src/usr/initservice/istepdispatcher/sptask.C index 280d894aa..c07f0d87e 100644 --- a/src/usr/initservice/istepdispatcher/sptask.C +++ b/src/usr/initservice/istepdispatcher/sptask.C @@ -269,7 +269,7 @@ void userConsoleComm( void * io_msgQ ) // return to main to end task } -void spTask( void *io_pArgs ) +void* spTask( void *io_pArgs ) { TRACFCOMP( g_trac_initsvc, @@ -286,7 +286,7 @@ void spTask( void *io_pArgs ) "spTask exit." ); // End the task. - task_end(); + return NULL; } |
