Convert the socket_ prefix to amqp_socket_

6 files changed, 25 insertions, 24 deletions

diff --git a/librabbitmq/amqp_connection.c b/librabbitmq/amqp_connection.c
index 7860669..5b5e813 100644
--- a/librabbitmq/amqp_connection.c
+++ b/librabbitmq/amqp_connection.c
@@ -169,8 +169,8 @@ void amqp_destroy_connection(amqp_connection_state_t state) {
 int amqp_end_connection(amqp_connection_state_t state) {
   int s = state->sockfd;
   amqp_destroy_connection(state);
-  if (socket_close(s) < 0)
-    return -encoded_socket_errno();
+  if (amqp_socket_close(s) < 0)
+    return -amqp_socket_error();
   else
     return 0;
 } 
@@ -443,7 +443,7 @@ int amqp_send_frame(amqp_connection_state_t state,
       iov[2].iov_base = &frame_end_byte;
       assert(FOOTER_SIZE == 1);
       iov[2].iov_len = FOOTER_SIZE;
-      res = socket_writev(state->sockfd, &iov[0], 3);
+      res = amqp_socket_writev(state->sockfd, &iov[0], 3);
       break;
     }
 
@@ -452,7 +452,7 @@ int amqp_send_frame(amqp_connection_state_t state,
   }
 
   if (res < 0)
-    return -encoded_socket_errno();
+    return -amqp_socket_error();
   else
     return 0;
 }
diff --git a/librabbitmq/amqp_socket.c b/librabbitmq/amqp_socket.c
index fc823be..d39f29d 100644
--- a/librabbitmq/amqp_socket.c
+++ b/librabbitmq/amqp_socket.c
@@ -70,7 +70,7 @@ int amqp_open_socket(char const *hostname,
   struct hostent *he;
   int one = 1; /* used as a buffer by setsockopt below */
 
-  res = socket_init();
+  res = amqp_socket_init();
   if (res)
     return res;
 
@@ -84,13 +84,14 @@ int amqp_open_socket(char const *hostname,
 
   sockfd = socket(PF_INET, SOCK_STREAM, 0);
   if (sockfd == -1)
-    return -encoded_socket_errno();
+    return -amqp_socket_error();
 
-  if (socket_setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)) < 0
+  if (amqp_socket_setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &one,
+			     sizeof(one)) < 0
       || connect(sockfd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
   {
-    res = -encoded_socket_errno();
-    socket_close(sockfd);
+    res = -amqp_socket_error();
+    amqp_socket_close(sockfd);
     return res;
   }
 
@@ -200,7 +201,7 @@ static int wait_frame_inner(amqp_connection_state_t state,
       if (result == 0)
 	return -ERROR_CONNECTION_CLOSED;
       else
-	return -encoded_socket_errno();
+	return -amqp_socket_error();
     }
 
     state->sock_inbound_limit = result;
diff --git a/librabbitmq/unix/socket.c b/librabbitmq/unix/socket.c
index 51db413..f4a7195 100644
--- a/librabbitmq/unix/socket.c
+++ b/librabbitmq/unix/socket.c
@@ -58,7 +58,7 @@
 #include "amqp_private.h"
 #include "socket.h"
 
-int socket_socket(int domain, int type, int proto)
+int amqp_socket_socket(int domain, int type, int proto)
 {
 	int flags;
 
diff --git a/librabbitmq/unix/socket.h b/librabbitmq/unix/socket.h
index 185e651..5cb37f1 100644
--- a/librabbitmq/unix/socket.h
+++ b/librabbitmq/unix/socket.h
@@ -60,18 +60,18 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-static inline int socket_init(void)
+static inline int amqp_socket_init(void)
 {
 	return 0;
 }
 
-extern int socket_socket(int domain, int type, int proto);
+extern int amqp_socket_socket(int domain, int type, int proto);
 
-#define socket_setsockopt setsockopt
-#define socket_close close
-#define socket_writev writev
+#define amqp_socket_setsockopt setsockopt
+#define amqp_socket_close close
+#define amqp_socket_writev writev
 
-static inline int encoded_socket_errno()
+static inline int amqp_socket_error()
 {
 	return errno | ERROR_CATEGORY_OS;
 }
diff --git a/librabbitmq/windows/socket.c b/librabbitmq/windows/socket.c
index f809f62..62a1e50 100644
--- a/librabbitmq/windows/socket.c
+++ b/librabbitmq/windows/socket.c
@@ -57,7 +57,7 @@
 
 static int called_wsastartup;
 
-int socket_init(void)
+int amqp_socket_init(void)
 {
 	if (!called_wsastartup) {
 		WSADATA data;
diff --git a/librabbitmq/windows/socket.h b/librabbitmq/windows/socket.h
index 6a2da25..3e0a378 100644
--- a/librabbitmq/windows/socket.h
+++ b/librabbitmq/windows/socket.h
@@ -53,12 +53,12 @@
 
 #include <winsock2.h>
 
-extern int socket_init(void);
+extern int amqp_socket_init(void);
 
-#define socket_socket socket
-#define socket_close closesocket
+#define amqp_socket_socket socket
+#define amqp_socket_close closesocket
 
-static inline int socket_setsockopt(int sock, int level, int optname,
+static inline int amqp_socket_setsockopt(int sock, int level, int optname,
                                     const void *optval, size_t optlen)
 {
         /* the winsock setsockopt function has its 4th argument as a
@@ -72,7 +72,7 @@ struct iovec {
 	char *iov_base;
 };
 
-static inline int socket_writev(int sock, struct iovec *iov, int nvecs)
+static inline int amqp_socket_writev(int sock, struct iovec *iov, int nvecs)
 {
 	DWORD ret;
 	if (WSASend(sock, (LPWSABUF)iov, nvecs, &ret, 0, NULL, NULL) == 0)
@@ -81,7 +81,7 @@ static inline int socket_writev(int sock, struct iovec *iov, int nvecs)
 		return -1;
 }
 
-static inline int encoded_socket_errno()
+static inline int amqp_socket_error()
 {
 	return WSAGetLastError() | ERROR_CATEGORY_OS;
 }