Code cleanup
This commit is contained in:
26
src/main.c
26
src/main.c
@@ -368,15 +368,10 @@ static ssize_t fd_write (int fd, const void *data, size_t size)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t fd_read_all (int fd, void *data, size_t size)
|
static size_t fd_read_all (int fd, void *data, size_t size)
|
||||||
{
|
{
|
||||||
size_t done = 0;
|
size_t done = 0;
|
||||||
|
|
||||||
struct pollfd pollfd = {
|
|
||||||
.fd = fd,
|
|
||||||
.events = POLLIN,
|
|
||||||
};
|
|
||||||
|
|
||||||
while (done<size) {
|
while (done<size) {
|
||||||
ssize_t ret = fd_read(fd, (uint8_t *)data+done, size-done);
|
ssize_t ret = fd_read(fd, (uint8_t *)data+done, size-done);
|
||||||
|
|
||||||
@@ -384,8 +379,14 @@ static ssize_t fd_read_all (int fd, void *data, size_t size)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
if (ret<0) {
|
if (ret<0) {
|
||||||
|
struct pollfd pollfd = {
|
||||||
|
.fd = fd,
|
||||||
|
.events = POLLIN,
|
||||||
|
};
|
||||||
|
|
||||||
if (!poll(&pollfd, 1, GT_TIMEOUT))
|
if (!poll(&pollfd, 1, GT_TIMEOUT))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,15 +396,10 @@ static ssize_t fd_read_all (int fd, void *data, size_t size)
|
|||||||
return done;
|
return done;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t fd_write_all (int fd, const void *data, size_t size)
|
static size_t fd_write_all (int fd, const void *data, size_t size)
|
||||||
{
|
{
|
||||||
size_t done = 0;
|
size_t done = 0;
|
||||||
|
|
||||||
struct pollfd pollfd = {
|
|
||||||
.fd = fd,
|
|
||||||
.events = POLLOUT,
|
|
||||||
};
|
|
||||||
|
|
||||||
while (done<size) {
|
while (done<size) {
|
||||||
ssize_t ret = fd_write(fd, (const uint8_t *)data+done, size-done);
|
ssize_t ret = fd_write(fd, (const uint8_t *)data+done, size-done);
|
||||||
|
|
||||||
@@ -411,8 +407,14 @@ static ssize_t fd_write_all (int fd, const void *data, size_t size)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
if (ret<0) {
|
if (ret<0) {
|
||||||
|
struct pollfd pollfd = {
|
||||||
|
.fd = fd,
|
||||||
|
.events = POLLOUT,
|
||||||
|
};
|
||||||
|
|
||||||
if (!poll(&pollfd, 1, GT_TIMEOUT))
|
if (!poll(&pollfd, 1, GT_TIMEOUT))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user