diff -r 7d48bed6ce0c -r 987c9837762f phoneclientserver/phoneclient/Src/Session/RPhCltServer.cpp --- a/phoneclientserver/phoneclient/Src/Session/RPhCltServer.cpp Tue Aug 31 15:45:17 2010 +0300 +++ b/phoneclientserver/phoneclient/Src/Session/RPhCltServer.cpp Wed Sep 01 12:15:03 2010 +0100 @@ -20,9 +20,9 @@ // INCLUDE FILES #include #include -#include "phclttypes.h" -#include "rphcltserver.h" -#include "phcltclientserver.h" +#include "PhCltTypes.h" +#include "RPhCltServer.h" +#include "PhCltClientServer.h" // CONSTANTS @@ -163,25 +163,25 @@ // thread dies for any reason. - TRequestStatus stat; - serverUnitOfExecution.Rendezvous( stat ); - if ( stat != KRequestPending ) + TRequestStatus stat; + serverUnitOfExecution.Rendezvous( stat ); + if ( stat != KRequestPending ) { User::Panic( PH_SRV_SU_FAILURE, EPhSrvStartupFailurePhase1 ); - serverUnitOfExecution.Kill( KErrAbort ); // abort startup + serverUnitOfExecution.Kill( KErrAbort ); // abort startup } - else + else { - serverUnitOfExecution.Resume(); // logon ok + serverUnitOfExecution.Resume(); // logon ok } // wait for start or death - User::WaitForRequest( stat ); - // we can't use the 'exit reason' if the server panicked as this - // is the panic 'reason' and may be '0' which cannot be distinguished - // from KErrNone - err = ( serverUnitOfExecution.ExitType() == EExitPanic ) + User::WaitForRequest( stat ); + // we can't use the 'exit reason' if the server panicked as this + // is the panic 'reason' and may be '0' which cannot be distinguished + // from KErrNone + err = ( serverUnitOfExecution.ExitType() == EExitPanic ) ? KErrGeneral : stat.Int(); serverUnitOfExecution.Close();