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

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

diff --git a/src/libstddjb/ipc_accept.c b/src/libstddjb/ipc_accept.c
index dc3eae7..5ff82d8 100644
--- a/src/libstddjb/ipc_accept.c
+++ b/src/libstddjb/ipc_accept.c
@@ -5,16 +5,17 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <string.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/webipc.h>
 
-int ipc_accept_internal (int s, char *p, unsigned int l, int *trunc, unsigned int options)
+int ipc_accept_internal (int s, char *p, size_t l, int *trunc, unsigned int options)
 {
   struct sockaddr_un sa ;
   socklen_t dummy = sizeof sa ;
-  register int fd ;
-  byte_zero((char*)&sa, (unsigned int)dummy) ;
+  int fd ;
+  memset(&sa, 0, dummy) ;
   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,7 +28,7 @@ int ipc_accept_internal (int s, char *p, unsigned int l, int *trunc, unsigned in
   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 ;
@@ -41,7 +42,7 @@ int ipc_accept_internal (int s, char *p, unsigned int l, int *trunc, unsigned in
     if (!l) return fd ;
     if (l < (dummy + 1)) dummy = l - 1 ;
     else *trunc = 0 ;
-    byte_copy(p, dummy, sa.sun_path) ;
+    memcpy(p, sa.sun_path, dummy) ;
     p[dummy] = 0 ;
   }
   return fd ;
-- 
cgit v1.3.1