mirror of
https://gitlab.xiph.org/xiph/icecast-common.git
synced 2024-12-04 14:46:31 -05:00
Fix comments (and remove old commented out code) from sock_write_bytes.
svn path=/trunk/net/; revision=3176
This commit is contained in:
parent
45c5df41f9
commit
c8b2e41e67
33
net/sock.c
33
net/sock.c
@ -193,16 +193,10 @@ int sock_close(sock_t sock)
|
|||||||
/* sock_write_bytes
|
/* sock_write_bytes
|
||||||
**
|
**
|
||||||
** write bytes to the socket
|
** write bytes to the socket
|
||||||
** this function will block until all bytes are
|
** this function will _NOT_ block
|
||||||
** written, or there is an unrecoverable error
|
|
||||||
** even if the socket is non-blocking
|
|
||||||
*/
|
*/
|
||||||
int sock_write_bytes(sock_t sock, const char *buff, const int len)
|
int sock_write_bytes(sock_t sock, const char *buff, const int len)
|
||||||
{
|
{
|
||||||
// int wrote, res, polled;
|
|
||||||
int res;
|
|
||||||
// struct pollfd socks;
|
|
||||||
|
|
||||||
/* sanity check */
|
/* sanity check */
|
||||||
if (!buff) {
|
if (!buff) {
|
||||||
return SOCK_ERROR;
|
return SOCK_ERROR;
|
||||||
@ -212,30 +206,7 @@ int sock_write_bytes(sock_t sock, const char *buff, const int len)
|
|||||||
return SOCK_ERROR;
|
return SOCK_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
// socks.fd = sock;
|
return send(sock, buff, len, 0);
|
||||||
// socks.events = POLLOUT;
|
|
||||||
|
|
||||||
// wrote = 0;
|
|
||||||
// while (wrote < len) {
|
|
||||||
// polled = poll(&socks, 1, 30000);
|
|
||||||
|
|
||||||
// if ((polled == -1) && sock_recoverable(sock_error()))
|
|
||||||
// continue;
|
|
||||||
// if (polled != 1)
|
|
||||||
// return SOCK_ERROR;
|
|
||||||
|
|
||||||
// res = send(sock, &buff[wrote], len - wrote, 0);
|
|
||||||
res = send(sock, buff, len, 0);
|
|
||||||
//
|
|
||||||
// if ((res < 0) && (!sock_recoverable(sock_error())))
|
|
||||||
// return SOCK_ERROR;
|
|
||||||
// if (res > 0)
|
|
||||||
// wrote += res;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return wrote;
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* sock_write_string
|
/* sock_write_string
|
||||||
|
Loading…
Reference in New Issue
Block a user