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_accept4.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/src/libstddjb/socket_accept4.c b/src/libstddjb/socket_accept4.c
index e504375..a50ade0 100644
--- a/src/libstddjb/socket_accept4.c
+++ b/src/libstddjb/socket_accept4.c
@@ -4,17 +4,18 @@
 #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/djbunix.h>
 #include <skalibs/socket.h>
 
-int socket_accept4_internal (int s, char *ip, uint16 *port, unsigned int options)
+int socket_accept4_internal (int s, char *ip, uint16_t *port, unsigned int options)
 {
   struct sockaddr_in sa ;
   socklen_t dummy = sizeof sa ;
-  register int fd ;
+  int fd ;
   do
 #ifdef SKALIBS_HASACCEPT4
     fd = accept4(s, (struct sockaddr *)&sa, &dummy, ((options & DJBUNIX_FLAG_NB) ? SOCK_NONBLOCK : 0) | ((options & DJBUNIX_FLAG_COE) ? SOCK_CLOEXEC : 0)) ;
@@ -27,13 +28,13 @@ int socket_accept4_internal (int s, char *ip, uint16 *port, unsigned int options
   if ((((options & DJBUNIX_FLAG_NB) ? ndelay_on(fd) : ndelay_off(fd)) < 0)
    || (((options & DJBUNIX_FLAG_COE) ? coe(fd) : uncoe(fd)) < 0))
   {
-    register int e = errno ;
+    int e = errno ;
     fd_close(fd) ;
     errno = e ;
     return -1 ;
   }
 #endif
-  byte_copy(ip, 4, (char *)&sa.sin_addr.s_addr) ;
+  memcpy(ip, &sa.sin_addr.s_addr, 4) ;
   uint16_unpack_big((char *)&sa.sin_port, port) ;
   return fd ;
 }
-- 
cgit v1.3.1