hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up code.

Browse Source
This commit is contained in:
Markus Makela
2015-09-16 10:22:29 +03:00
parent 5d1895561c
commit fe9babe9ec
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dcb.c
View File

@ -3053,7 +3053,6 @@ int dcb_bytes_readable_SSL (DCB *dcb, int nread)
int rval = 0; int rval = 0;
int nbytes; int nbytes;
int rc = ioctl(dcb->fd, FIONREAD, &nbytes); int rc = ioctl(dcb->fd, FIONREAD, &nbytes);
int pending = SSL_pending (dcb->ssl);
if (rc == -1) if (rc == -1)
{ {
@ -3070,6 +3069,7 @@ int dcb_bytes_readable_SSL (DCB *dcb, int nread)
} }
else else
{ {
int pending = SSL_pending(dcb->ssl);
rval = nbytes + pending; rval = nbytes + pending;
if (rval == 0 && nread == 0) if (rval == 0 && nread == 0)
{ {
@ -3134,7 +3134,7 @@ void dcb_log_ssl_read_error(DCB *dcb, int ssl_errno, int rc)
{ {
while ((ssl_errno = ERR_get_error()) != 0) while ((ssl_errno = ERR_get_error()) != 0)
{ {
ERR_error_string_n(ssl_errno, errbuf, 200); ERR_error_string_n(ssl_errno, errbuf, STRERROR_BUFLEN);
skygw_log_write(LE, skygw_log_write(LE,
"%s", "%s",
errbuf); errbuf);