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

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

diff --git a/src/libstddjb/cdb_read.c b/src/libstddjb/cdb_read.c
index 76fbd63..e857511 100644
--- a/src/libstddjb/cdb_read.c
+++ b/src/libstddjb/cdb_read.c
@@ -1,23 +1,24 @@
 /* ISC license. */
 
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
 #include <errno.h>
 #include <skalibs/error.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/uint32.h>
-#include <skalibs/djbunix.h>
 #include <skalibs/cdb.h>
 
-int cdb_read (struct cdb *c, char *buf, unsigned int len, uint32 pos)
+int cdb_read (struct cdb *c, char *buf, unsigned int len, uint32_t pos)
 {
   if (c->map)
   {
     if ((pos > c->size) || (c->size - pos < len)) return (errno = EPROTO, -1) ;
-    byte_copy(buf, len, c->map + pos) ;
+    memcpy(buf, c->map + pos, len) ;
   }
   else
   {
-    if (seek_set(c->fd, pos) < 0) return -1 ;
+    if (lseek(c->fd, pos, SEEK_SET) < 0) return -1 ;
     if (allread(c->fd, buf, len) < len) return -1 ;
   }
   return 0 ;
-- 
cgit v1.2.3