iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up more warnings.

Browse Source
This commit is contained in:
baines
2013-02-27 20:53:14 -05:00
parent c256116d81
commit 82a708d6a1
13 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Csocket.cpp
View File

@@ -757,7 +757,7 @@ bool CSMonitorFD::CheckFDs( const std::map< int, short > & miiReadyFds )
if( itFD != miiReadyFds.end() )
miiTriggerdFds[itFD->first] = itFD->second;
}
if( miiTriggerdFds.size() )
if( !miiTriggerdFds.empty() )
return( FDsThatTriggered( miiTriggerdFds ) );
return( m_bEnabled );
}
@@ -1269,10 +1269,9 @@ bool Csock::Listen( uint16_t iPort, int iMaxConns, const CS_STRING & sBindHost,
cs_sock_t Csock::Accept( CS_STRING & sHost, uint16_t & iRPort )
{
cs_sock_t iSock = CS_INVALID_SOCK;
struct sockaddr_storage cAddr;
socklen_t iAddrLen = sizeof( cAddr );
iSock = accept( m_iReadSock, ( struct sockaddr * )&cAddr, &iAddrLen );
cs_sock_t iSock = accept( m_iReadSock, ( struct sockaddr * )&cAddr, &iAddrLen );
if( iSock != CS_INVALID_SOCK && getpeername( iSock, ( struct sockaddr * )&cAddr, &iAddrLen ) == 0 )
{
ConvertAddress( &cAddr, iAddrLen, sHost, &iRPort );
@@ -2816,7 +2815,7 @@ void CSocketManager::Loop()
{
case SUCCESS:
{
for( std::map<Csock *, EMessages>::iterator itSock = mpeSocks.begin(); itSock != mpeSocks.end(); itSock++ )
for( std::map<Csock *, EMessages>::iterator itSock = mpeSocks.begin(); itSock != mpeSocks.end(); ++itSock )
{
Csock * pcSock = itSock->first;
EMessages iErrno = itSock->second;
@@ -2968,7 +2967,7 @@ Csock * CSocketManager::FindSockByName( const CS_STRING & sName )
{
std::vector<Csock *>::iterator it;
std::vector<Csock *>::iterator it_end = this->end();
for( it = this->begin(); it != it_end; it++ )
for( it = this->begin(); it != it_end; ++it )
{
if( (*it)->GetSockName() == sName )
return( *it );