From 49d8fa1058aaf23c29e074b2314492ae40d2f557 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 21 Feb 2017 12:05:07 +0000
Subject:  Types change: big pass on libstddjb and libunixonacid

 libdatastruct still missing, library still not functional
---
 src/libstddjb/socket_recv4.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/libstddjb/socket_recv4.c')

diff --git a/src/libstddjb/socket_recv4.c b/src/libstddjb/socket_recv4.c
index 02354e9..09572d9 100644
--- a/src/libstddjb/socket_recv4.c
+++ b/src/libstddjb/socket_recv4.c
@@ -3,20 +3,21 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <stdint.h>
+#include <string.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/socket.h>
 
-int socket_recv4 (int s, char *buf, unsigned int len, char *ip, uint16 *port)
+ssize_t socket_recv4 (int s, char *buf, size_t len, char *ip, uint16_t *port)
 {
   struct sockaddr_in sa ;
   socklen_t dummy = sizeof sa ;
-  register int r ;
+  ssize_t r ;
   do r = recvfrom(s, buf, len, 0, (struct sockaddr *)&sa, &dummy) ;
   while ((r == -1) && (errno == EINTR)) ;
   if (r == -1) return -1 ;
-  byte_copy(ip, 4, (char *)&sa.sin_addr) ;
+  memcpy(ip, &sa.sin_addr, 4) ;
   uint16_unpack_big((char *)&sa.sin_port, port) ;
   return r ;
 }
-- 
cgit v1.3.1