ps/hermes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

FIX: add braces to remove warnings

Browse source
This commit is contained in:
Juan José Gutiérrez de Quevedo Pérez 2014-06-29 21:24:59 +02:00
parent 02bf18dbcd
commit a96826a208
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Socket.cpp
View file

@ -228,21 +228,33 @@ ssize_t Socket::readBytes(void *buf,ssize_t lon)
#ifdef HAVE_SSL #ifdef HAVE_SSL
if(ssl_enabled) if(ssl_enabled)
{
retval=SSL_read(ssl,buf,lon); retval=SSL_read(ssl,buf,lon);
}
else else
#endif //HAVE_SSL #endif //HAVE_SSL
{
retval=recv(fd,(char *)buf,lon,MSG_NOSIGNAL); retval=recv(fd,(char *)buf,lon,MSG_NOSIGNAL);
}
if(!retval) if(!retval)
{
throw NetworkException(_("Peer closed connection"),__FILE__,__LINE__); throw NetworkException(_("Peer closed connection"),__FILE__,__LINE__);
}
if(retval<0) if(retval<0)
{
#ifdef HAVE_SSL #ifdef HAVE_SSL
if(ssl_enabled) if(ssl_enabled)
{
throw NetworkException(_("SSL error number: ")+Utils::inttostr(SSL_get_error(ssl,retval)),__FILE__,__LINE__); throw NetworkException(_("SSL error number: ")+Utils::inttostr(SSL_get_error(ssl,retval)),__FILE__,__LINE__);
}
else else
#endif //HAVE_SSL #endif //HAVE_SSL
{
throw NetworkException(_(Utils::errnotostrerror(errno)),__FILE__,__LINE__); throw NetworkException(_(Utils::errnotostrerror(errno)),__FILE__,__LINE__);
}
}
readed+=lon; readed+=lon;
} }
@ -308,12 +320,18 @@ void Socket::writeBytes(void *bytes,ssize_t len)
throw NetworkException(_("Peer closed connection"),__FILE__,__LINE__); throw NetworkException(_("Peer closed connection"),__FILE__,__LINE__);
if(retval<0) if(retval<0)
{
#ifdef HAVE_SSL #ifdef HAVE_SSL
if(ssl_enabled) if(ssl_enabled)
{
throw NetworkException(_("SSL error number: ")+Utils::inttostr(SSL_get_error(ssl,retval)),__FILE__,__LINE__); throw NetworkException(_("SSL error number: ")+Utils::inttostr(SSL_get_error(ssl,retval)),__FILE__,__LINE__);
}
else else
#endif //HAVE_SSL #endif //HAVE_SSL
{
throw NetworkException(_(Utils::errnotostrerror(errno)),__FILE__,__LINE__); throw NetworkException(_(Utils::errnotostrerror(errno)),__FILE__,__LINE__);
}
}
written+=len; written+=len;
} }
} }
@ -465,9 +483,13 @@ string Socket::resolveInverselyToString(string ip)
error=getnameinfo(&addr,sizeof(struct sockaddr),hostname,NI_MAXHOST,NULL,0,NI_NAMEREQD); error=getnameinfo(&addr,sizeof(struct sockaddr),hostname,NI_MAXHOST,NULL,0,NI_NAMEREQD);
if(error) if(error)
{
if(error==EAI_NONAME) //if the problem is that we didn't get a hostname, return empty string if(error==EAI_NONAME) //if the problem is that we didn't get a hostname, return empty string
{
hostname[0]='\0'; hostname[0]='\0';
}
else else
{
#ifdef HAVE_GAI_STRERROR #ifdef HAVE_GAI_STRERROR
throw Exception(gai_strerror(error)+Utils::inttostr(error),__FILE__,__LINE__); throw Exception(gai_strerror(error)+Utils::inttostr(error),__FILE__,__LINE__);
#else #else
@ -477,6 +499,8 @@ string Socket::resolveInverselyToString(string ip)
throw Exception("Socket error number "+Utils::inttostr(error),__FILE__,__LINE__); throw Exception("Socket error number "+Utils::inttostr(error),__FILE__,__LINE__);
#endif //WIN32 #endif //WIN32
#endif //HAVE_GAI_STRERROR #endif //HAVE_GAI_STRERROR
}
}
return string(hostname); return string(hostname);
} }