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

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

diff --git a/src/libstddjb/socket_accept6.c b/src/libstddjb/socket_accept6.c
index f52efbb..ff11bce 100644
--- a/src/libstddjb/socket_accept6.c
+++ b/src/libstddjb/socket_accept6.c
@@ -4,20 +4,21 @@
 #include <skalibs/nonposix.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <string.h>
+#include <stdint.h>
 #include <errno.h>
 #include <skalibs/uint16.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/ip46.h>
 #include <skalibs/socket.h>
 
 #ifdef SKALIBS_IPV6_ENABLED
 
-int socket_accept6_internal (int s, char *ip6, uint16 *port, unsigned int options)
+int socket_accept6_internal (int s, char *ip6, uint16_t *port, unsigned int options)
 {
   struct sockaddr_in6 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)) ;
@@ -30,20 +31,20 @@ int socket_accept6_internal (int s, char *ip6, uint16 *port, unsigned int option
   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(ip6, 16, (char const *)sa.sin6_addr.s6_addr) ;
+  memcpy(ip6, sa.sin6_addr.s6_addr, 16) ;
   uint16_unpack_big((char *)&sa.sin6_port, port) ;
   return fd ;
 }
 
 #else
 
-int socket_accept6_internal (int s, char *ip6, uint16 *port, unsigned int options)
+int socket_accept6_internal (int s, char *ip6, uint16_t *port, unsigned int options)
 {
   (void)s ;
   (void)ip6 ;
-- 
cgit v1.2.3