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

Removed unnecessary local variables for errno since it is thread safe.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-11 14:51:55 +02:00
parent 0ea4dd63a9
commit 8311d02f61
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/core/dcb.c
View File

@ -662,7 +662,6 @@ int dcb_read(
int rc; int rc;
int n ; int n ;
int nread = 0; int nread = 0;
int eno = 0;
CHK_DCB(dcb); CHK_DCB(dcb);
while (true) while (true)
@ -673,8 +672,6 @@ int dcb_read(
if (rc == -1) if (rc == -1)
{ {
eno = errno;
errno = 0;
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : ioctl FIONREAD for dcb %p in " "Error : ioctl FIONREAD for dcb %p in "
@ -682,8 +679,8 @@ int dcb_read(
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd, dcb->fd,
eno, errno,
strerror(eno)))); strerror(errno))));
n = -1; n = -1;
goto return_n; goto return_n;
} }
@ -731,22 +728,18 @@ int dcb_read(
"for dcb %p fd %d, due %d, %s.", "for dcb %p fd %d, due %d, %s.",
dcb, dcb,
dcb->fd, dcb->fd,
eno, errno,
strerror(eno)))); strerror(errno))));
n = -1; n = -1;
ss_dassert(buffer != NULL);
goto return_n; goto return_n;
} }
GW_NOINTR_CALL(n = read(dcb->fd, GWBUF_DATA(buffer), bufsize); GW_NOINTR_CALL(n = read(dcb->fd, GWBUF_DATA(buffer), bufsize);
dcb->stats.n_reads++); dcb->stats.n_reads++);
if (n <= 0) if (n <= 0)
{ {
int eno = errno; if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK)
errno = 0;
if (eno != 0 && eno != EAGAIN && eno != EWOULDBLOCK)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
@ -755,10 +748,10 @@ int dcb_read(
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd, dcb->fd,
eno, errno,
strerror(eno)))); strerror(errno))));
} }
gwbuf_free(buffer); gwbuf_free(buffer);
goto return_n; goto return_n;
} }
nread += n; nread += n;