1 files changed, 11 insertions, 10 deletions
diff --git a/src/libstddjb/openwritevnclose_suffix.c b/src/libstddjb/openwritevnclose_suffix.c
index 0440960..d0185e6 100644
--- a/src/libstddjb/openwritevnclose_suffix.c
+++ b/src/libstddjb/openwritevnclose_suffix.c
@@ -1,25 +1,26 @@
 /* ISC license. */
 
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <skalibs/uint64.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/siovec.h>
 #include <skalibs/djbunix.h>
 
-int openwritevnclose_suffix_internal (char const *fn, siovec_t const *v, unsigned int n, uint64 *dev, uint64 *ino, int dosync, char const *suffix)
+int openwritevnclose_suffix_internal (char const *fn, struct iovec const *v, unsigned int n, dev_t *dev, ino_t *ino, int dosync, char const *suffix)
 {
-  uint64 tmpdev, tmpino ;
-  unsigned int len = str_len(fn) ;
-  unsigned int suffixlen = str_len(suffix) ;
+  dev_t tmpdev ;
+  ino_t tmpino ;
+  size_t len = strlen(fn) ;
+  size_t suffixlen = strlen(suffix) ;
   char tmp[len + suffixlen + 1] ;
-  byte_copy(tmp, len, fn) ;
-  byte_copy(tmp + len, suffixlen + 1, suffix) ;
+  memcpy(tmp, fn, len) ;
+  memcpy(tmp + len, suffix, suffixlen + 1) ;
   if (!openwritevnclose_unsafe_internal(tmp, v, n, dev ? &tmpdev : 0, ino ? &tmpino : 0, dosync)) return 0 ;	
   if (rename(tmp, fn) < 0)
   {
-    register int e = errno ;
+    int e = errno ;
     unlink(tmp) ;
     errno = e ;
     return 0 ;