diff -r 4332f0f7be53 -r acd3cd4aaceb genericopenlibs/openenvcore/backend/inc/sysif.h --- a/genericopenlibs/openenvcore/backend/inc/sysif.h Thu Aug 19 11:33:45 2010 +0300 +++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Tue Aug 31 16:54:36 2010 +0300 @@ -114,7 +114,7 @@ */ { public: - void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock,RFastLock* aDefConnLock,RFastLock* aAESelectLock) + void StorePtrs(RHeap* aHeap, RFs* aFs, RSocketServ* aSs, RCommServ* aCs, RFastLock* aSsLock, RFastLock* aCsLock) { iHeap = aHeap; iFs = aFs; @@ -122,8 +122,6 @@ iCs = aCs; iSsLock = aSsLock; iCsLock = aCsLock; - iDefConnLock = aDefConnLock; - iAESelectLock = aAESelectLock; } ~TCLSICleanup() @@ -134,8 +132,6 @@ iCs->Close(); iCsLock->Close(); iHeap->Close(); - iDefConnLock->Close(); - iAESelectLock->Close(); } private: RHeap* iHeap; @@ -144,8 +140,6 @@ RCommServ* iCs; RFastLock* iSsLock; RFastLock* iCsLock; - RFastLock* iDefConnLock; - RFastLock* iAESelectLock; }; @@ -167,7 +161,7 @@ }; -class CFileTable +class CFileTable // codescanner::missingcclass /* @internalComponent */ @@ -512,7 +506,7 @@ int aselect(int maxfd, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *tvptr, TRequestStatus* requeststatus,int& anErrno); - int cancelaselect(TRequestStatus* requeststatus, int& anErrno, TBool perform_cleanup = EFalse); + int cancelaselect(TRequestStatus* requeststatus,int& anErrno,int performcleanup = 0); int eselect(int maxfd, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *tvptr, int arraycount,TRequestStatus* waitarray,int& anErrno); @@ -558,7 +552,6 @@ //Set the default interface for network operations int setdefaultif(const struct ifreq* aIfReq); - int unsetdefaultif(TBool allow_bringup = ETrue); IMPORT_C CFileDescBase* GetDesc(int aFid); @@ -676,10 +669,6 @@ RConnection iDefConnection; //Protect the iDefConnection from concurrent GetDefaultConnection calls RFastLock iDefConnLock; - //Calling unsetdefaultif(), instead of setdefaultif(NULL) ensures that the torn down - //connection is not brought back up again, by subsequent socket/network calls. - //This variable enables this facility. It is reset to default (ETrue) by setdefaultif() - TBool iDefConnResurrect; //Lock for protecting iASelectRequest across threads RFastLock iASelectLock;