repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SOCKET: Use recv/send for all socket io on all platforms
[deb_libnfs.git]
/
lib
/
socket.c
diff --git
a/lib/socket.c
b/lib/socket.c
index 1dbbdeae5eb5c21758f5e1c7789765f706706d71..6f626529be9a2c3d6c7b982a648e9edf806d2e2d 100644
(file)
--- a/
lib/socket.c
+++ b/
lib/socket.c
@@
-118,11
+118,7
@@
static int rpc_write_to_socket(struct rpc_context *rpc)
total = rpc->outqueue->outdata.size;
total = rpc->outqueue->outdata.size;
-#if defined(WIN32)
count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
-#else
- count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
-#endif
if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
@@
-202,11
+198,7
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
if (rpc->inpos < 4) {
size = 4 - rpc->inpos;
if (rpc->inpos < 4) {
size = 4 - rpc->inpos;
-#if defined(WIN32)
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
- count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
if (count == -1) {
if (errno == EINTR) {
return 0;
if (count == -1) {
if (errno == EINTR) {
return 0;
@@
-242,11
+234,7
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
size = rpc->insize - rpc->inpos;
}
size = rpc->insize - rpc->inpos;
}
-#if defined(WIN32)
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
- count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
if (count == -1) {
if (errno == EINTR) {
return 0;
if (count == -1) {
if (errno == EINTR) {
return 0;