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

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

diff --git a/src/libstddjb/socket_conn6.c b/src/libstddjb/socket_conn6.c
index 57bb3f8..9b0316b 100644
--- a/src/libstddjb/socket_conn6.c
+++ b/src/libstddjb/socket_conn6.c
@@ -3,22 +3,23 @@
 #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>
 #include <skalibs/ip46.h>
 
 #ifdef SKALIBS_IPV6_ENABLED
 
-int socket_connect6 (int s, char const *ip6, uint16 port)
+int socket_connect6 (int s, char const *ip6, uint16_t port)
 {
   struct sockaddr_in6 sa ;
-  register int r ;
-  byte_zero(&sa, sizeof sa) ;
+  int r ;
+  memset(&sa, 0, sizeof sa) ;
   sa.sin6_family = AF_INET6 ;
   uint16_pack_big((char *)&sa.sin6_port,port) ;
-  byte_copy((char *)sa.sin6_addr.s6_addr, 16, ip6) ;
+  memcpy(sa.sin6_addr.s6_addr, ip6, 16) ;
   do r = connect(s, (struct sockaddr *)&sa, sizeof sa) ;
   while ((r == -1) && (errno == EINTR)) ;
   if ((r == -1) && (errno == EALREADY)) errno = EINPROGRESS ;
@@ -27,7 +28,7 @@ int socket_connect6 (int s, char const *ip6, uint16 port)
 
 #else
 
-int socket_connect6 (int s, char const *ip6, uint16 port)
+int socket_connect6 (int s, char const *ip6, uint16_t port)
 {
   (void)s ;
   (void)ip6 ;
-- 
cgit v1.2.3