linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct some bitwise operators and permit debugger breakpoints

Browse Source 
r2966 | dcl | 2010-07-01 12:38:34 +1000 (Thu, 01 Jul 2010) | 2 lines
This commit is contained in:
Douglas Clowes
2010-07-01 12:38:34 +10:00
parent 9ba11580ad
commit 9ec08cbf85
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
network.c
View File

@@ -327,7 +327,7 @@ CreateSocketAdress(
return -1;
}
oldopts = fcntl(self->sockid, F_GETFL, 0);
if (! (oldopts | O_NONBLOCK)) {
if (! (oldopts & O_NONBLOCK)) { /* DCL was | */
/* assume success when in blocking mode */
return 1;
}
@@ -358,7 +358,7 @@ CreateSocketAdress(
}
}
/* reset to blocking mode */
fcntl(self->sockid, F_SETFL, oldopts | ~ O_NONBLOCK);
fcntl(self->sockid, F_SETFL, oldopts & ~ O_NONBLOCK); /* DCL was | */
return iret;
}
/*------------------------------------------------------------------------*/
@@ -476,7 +476,8 @@ CreateSocketAdress(
expire = time(NULL) + TIMEOUT;
while (l > 0) {
delta = expire - time(NULL);
if (delta <= 0) break;
if (delta <= 0)
break;
FD_SET(self->sockid,&lMask);
tmo.tv_usec = 0;
tmo.tv_sec = delta;
@@ -490,7 +491,8 @@ CreateSocketAdress(
NetError(buf);
return 0;
}
if (!FD_ISSET(self->sockid,&lMask)) break;
if (!FD_ISSET(self->sockid,&lMask))
break;
iRet = send(self->sockid,pos,l,0);
disconnected = (iRet == 0);