kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apple ssl: aesthetic change (get rid of yoda comparisons/conditionals)

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-01-06 14:45:05 -08:00
parent 7c63232157
commit f75684a412
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ixwebsocket/IXSocketAppleSSL.cpp
View File

@ -80,11 +80,15 @@ namespace ix
{ {
*len = (size_t) status; *len = (size_t) status;
if (requested_sz > *len) if (requested_sz > *len)
{
return errSSLWouldBlock; return errSSLWouldBlock;
}
else else
{
return noErr; return noErr;
}
} }
else if (0 == status) else if (status == 0)
{ {
*len = 0; *len = 0;
return errSSLClosedGraceful; return errSSLClosedGraceful;
@ -122,11 +126,15 @@ namespace ix
{ {
*len = (size_t) status; *len = (size_t) status;
if (to_write_sz > *len) if (to_write_sz > *len)
{
return errSSLWouldBlock; return errSSLWouldBlock;
}
else else
{
return noErr; return noErr;
}
} }
else if (0 == status) else if (status == 0)
{ {
*len = 0; *len = 0;
return errSSLClosedGraceful; return errSSLClosedGraceful;
@ -134,7 +142,7 @@ namespace ix
else else
{ {
*len = 0; *len = 0;
if (EAGAIN == errno) if (errno == EAGAIN)
{ {
return errSSLWouldBlock; return errSSLWouldBlock;
} }
@ -181,7 +189,7 @@ namespace ix
do do
{ {
status = SSLHandshake(_sslContext); status = SSLHandshake(_sslContext);
} while (errSSLWouldBlock == status || errSSLServerAuthCompleted == status); } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
if (status == errSSLServerAuthCompleted) if (status == errSSLServerAuthCompleted)
{ {
@ -189,7 +197,7 @@ namespace ix
do do
{ {
status = SSLHandshake(_sslContext); status = SSLHandshake(_sslContext);
} while (errSSLWouldBlock == status || errSSLServerAuthCompleted == status); } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
} }
} }
else else
@ -197,11 +205,11 @@ namespace ix
do do
{ {
status = SSLHandshake(_sslContext); status = SSLHandshake(_sslContext);
} while (errSSLWouldBlock == status || errSSLServerAuthCompleted == status); } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
} }
} }
if (noErr != status) if (status != noErr)
{ {
errMsg = getSSLErrorDescription(status); errMsg = getSSLErrorDescription(status);
close(); close();
@ -236,7 +244,7 @@ namespace ix
ret += processed; ret += processed;
buf += processed; buf += processed;
nbyte -= processed; nbyte -= processed;
} while (nbyte > 0 && errSSLWouldBlock == status); } while (nbyte > 0 && status == errSSLWouldBlock);
if (ret == 0 && errSSLClosedAbort != status) ret = -1; if (ret == 0 && errSSLClosedAbort != status) ret = -1;
return ret; return ret;
@ -251,7 +259,7 @@ namespace ix
ssize_t SocketAppleSSL::recv(void* buf, size_t nbyte) ssize_t SocketAppleSSL::recv(void* buf, size_t nbyte)
{ {
OSStatus status = errSSLWouldBlock; OSStatus status = errSSLWouldBlock;
while (errSSLWouldBlock == status) while (status == errSSLWouldBlock)
{ {
size_t processed = 0; size_t processed = 0;
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);