From 9da1fa65519ac402f8e8a9350e37185397e075a9 Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 10 Nov 2009 12:27:15 +0100
Subject: [PATCH] Removed unneeded functions from fwp_utils.h

This was done to increase readability of the code when searching for
problems.
---
 fwp/lib/fwp/fwp_endpoint.c |  9 ++++-----
 fwp/lib/fwp/fwp_utils.h    | 27 ---------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/fwp/lib/fwp/fwp_endpoint.c b/fwp/lib/fwp/fwp_endpoint.c
index 93756af..05d4dd7 100644
--- a/fwp/lib/fwp/fwp_endpoint.c
+++ b/fwp/lib/fwp/fwp_endpoint.c
@@ -487,9 +487,9 @@ int fwp_recv_conn(struct fwp_endpoint *ep, void *buffer,
 			
 		FWP_DEBUG("Prepare to receive tcp data\n");
         	peer->addrlen = sizeof(struct sockaddr_in);
-		len = _fwp_recvfrom(ep->c_sockd[i], buffer, 
-					buffer_size,0, peer);
 
+		len = recvfrom(ep->c_sockd[i], buffer, buffer_size, 0,
+			       (struct sockaddr*)&peer->addr, &peer->addrlen);
 		if (len < 0) /* Error */
 			return len;
 		
@@ -535,9 +535,8 @@ ssize_t fwp_recv(struct fwp_endpoint *ep,
 	}*/
 	
 	if (ep->attr.reliability == FWP_EPOINT_BESTEFFORT) {	
-		len = _fwp_recvfrom(ep->sockd, buffer, 
-					buffer_size, 0, peer);
-		
+		len = recvfrom(ep->sockd, buffer, buffer_size, 0,
+			       (struct sockaddr*)&peer->addr, &peer->addrlen);
 		*from = addr->sin_addr.s_addr;
 		return len;
 	}
diff --git a/fwp/lib/fwp/fwp_utils.h b/fwp/lib/fwp/fwp_utils.h
index 3b0b77b..5020ec5 100644
--- a/fwp/lib/fwp/fwp_utils.h
+++ b/fwp/lib/fwp/fwp_utils.h
@@ -63,33 +63,6 @@ extern const unsigned int ac_to_tos[4];
 extern const char *ac_to_text[4];
 */
 
-static inline ssize_t
-_fwp_sendto(int s, const void *buf, size_t len, int flags,
-	    const fwp_sockaddr_t *sockaddr)
-{
-	ssize_t ret;
-	ret = sendto(s, buf, len, flags, (struct sockaddr*)&sockaddr->addr, sockaddr->addrlen);
-	return ret;
-}
-
-static inline ssize_t
-_fwp_recvfrom(int s, void *buf, size_t len, int flags,
-	      fwp_sockaddr_t *sockaddr)
-{
-	ssize_t ret;
-	ret = recvfrom(s, buf, len, flags, (struct sockaddr*)&sockaddr->addr, 
-		       &sockaddr->addrlen);
-	return ret;
-}
-
-static inline ssize_t
-_fwp_recv(int s, void *buf, size_t len, int flags)
-{
-	ssize_t ret;
-	ret = recv(s, buf, len, flags);
-	return ret;
-}
-
 void fwp_timespec_add (struct timespec *sum, const struct timespec *left, 
 				const struct timespec *right);
 void fwp_timespec_sub (struct timespec *diff, const struct timespec *left,
-- 
2.39.2