Skip to content
Snippets Groups Projects
Commit 93d0684e authored by Steven Murray's avatar Steven Murray Committed by Steven Murray
Browse files

Cleaned code so that the -Wall -pedantic options of gcc do not display warnings.

I have replaced C++ comments in C code with C code comments.

I have moved/changed variable declarations to not bream the ISO C90 rule
against mixed declarations and code.
parent b1c83f70
Branches
Tags
No related merge requests found
......@@ -88,9 +88,11 @@ int netconnect_timeout(SOCKET fd,
}
/* Restore previous handlers */
int save_errno = errno;
_netsignal(SIGPIPE, sigpipe);
errno = save_errno;
{
int save_errno = errno;
_netsignal(SIGPIPE, sigpipe);
errno = save_errno;
}
/* Restore blocking socket if connect was successful */
if ( timeout >= 0 && rc == 0 ) {
nonblocking = 0;
......@@ -185,9 +187,11 @@ ssize_t netread_timeout(SOCKET fd,
}
/* Restore previous handlers */
int save_errno = errno;
_netsignal(SIGPIPE, sigpipe);
errno = save_errno;
{
int save_errno = errno;
_netsignal(SIGPIPE, sigpipe);
errno = save_errno;
}
if (flag != 0) {
/* Return -1 if error */
......@@ -277,9 +281,11 @@ ssize_t netwrite_timeout(SOCKET fd,
}
/* Restore previous handlers */
int save_errno = errno;
_netsignal(SIGPIPE, sigpipe);
errno = save_errno;
{
int save_errno = errno;
_netsignal(SIGPIPE, sigpipe);
errno = save_errno;
}
if (flag != 0) {
/* Return -1 if error */
......@@ -318,13 +324,12 @@ Sigfunc *_netsignal(int signo,
int _net_isclosed(int fd)
{
struct pollfd pollit;
char buf[1];
pollit.fd = fd;
pollit.events = POLLIN;
pollit.revents = 0;
char buf[1];
/* Will return > 0 if the descriptor is closed */
if (poll(&pollit, 1, 0) > 0) {
if (recv(fd, buf, sizeof(buf), MSG_PEEK | MSG_DONTWAIT) == 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment