From 61e18281077967ce3684f9182e8d7337da37c0b2 Mon Sep 17 00:00:00 2001
From: David Wragg <david@rabbitmq.com>
Date: Mon, 26 Jul 2010 02:36:39 +0100
Subject: Replace socket_{read,write} with recv and send

---
 librabbitmq/amqp_connection.c |  4 ++--
 librabbitmq/amqp_socket.c     |  7 +++----
 librabbitmq/unix/socket.h     |  2 --
 librabbitmq/windows/socket.h  | 10 ----------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/librabbitmq/amqp_connection.c b/librabbitmq/amqp_connection.c
index 63af96a..7860669 100644
--- a/librabbitmq/amqp_connection.c
+++ b/librabbitmq/amqp_connection.c
@@ -429,8 +429,8 @@ int amqp_send_frame(amqp_connection_state_t state,
   res = inner_send_frame(state, frame, &encoded, &payload_len);
   switch (res) {
     case 0:
-      res = socket_write(state->sockfd, state->outbound_buffer.bytes,
-			 payload_len + (HEADER_SIZE + FOOTER_SIZE));
+      res = send(state->sockfd, state->outbound_buffer.bytes,
+		 payload_len + (HEADER_SIZE + FOOTER_SIZE), 0);
       break;
 
     case 1: {
diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c
index ff19372..3f88120 100644
--- a/librabbitmq/amqp_socket.c
+++ b/librabbitmq/amqp_socket.c
@@ -111,7 +111,7 @@ static char *header() {
 }
 
 int amqp_send_header(amqp_connection_state_t state) {
-  return socket_write(state->sockfd, header(), 8);
+  return send(state->sockfd, header(), 8, 0);
 }
 
 int amqp_send_header_to(amqp_connection_state_t state,
@@ -194,9 +194,8 @@ static int wait_frame_inner(amqp_connection_state_t state,
       assert(result != 0);
     }	
 
-    result = socket_read(state->sockfd,
-			 state->sock_inbound_buffer.bytes,
-			 state->sock_inbound_buffer.len);
+    result = recv(state->sockfd, state->sock_inbound_buffer.bytes,
+		  state->sock_inbound_buffer.len, 0);
     if (result <= 0) {
       if (result == 0)
 	return -ERROR_CONNECTION_CLOSED;
diff --git a/librabbitmq/unix/socket.h b/librabbitmq/unix/socket.h
index dff88c9..e54c4cb 100644
--- a/librabbitmq/unix/socket.h
+++ b/librabbitmq/unix/socket.h
@@ -70,8 +70,6 @@ extern int socket_socket(int domain, int type, int proto);
 #define socket_connect connect
 #define socket_setsockopt setsockopt
 #define socket_close close
-#define socket_read read
-#define socket_write write
 #define socket_writev writev
 
 static inline int encoded_socket_errno()
diff --git a/librabbitmq/windows/socket.h b/librabbitmq/windows/socket.h
index e0a9799..a5b091d 100644
--- a/librabbitmq/windows/socket.h
+++ b/librabbitmq/windows/socket.h
@@ -67,16 +67,6 @@ static inline int socket_setsockopt(int sock, int level, int optname,
         return setsockopt(sock, level, optname, (const char *)optval, optlen);
 }
 
-static inline int socket_read(int sock, void *buf, size_t count)
-{
-	return recv(sock, buf, count, 0);
-}
-
-static inline int socket_write(int sock, void *buf, size_t count)
-{
-	return send(sock, buf, count, 0);
-}
-
 /* same as WSABUF */
 struct iovec {
 	u_long iov_len;
-- 
cgit v1.2.1