Merge master

[netatalk.git] / libatalk / cnid / dbd / cnid_dbd.h

diff --git a/libatalk/cnid/dbd/cnid_dbd.h b/libatalk/cnid/dbd/cnid_dbd.h
index 1f645908358b442633beae7e730e9789be690975..fdba4c042a62591e3e771ed449ad7de6588986ca 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.h
+++ b/libatalk/cnid/dbd/cnid_dbd.h
@@ -8,31 +8,30 @@
 #ifndef _ATALK_CNID_DBD__H
 #define _ATALK_CNID_DBD__H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
+#include <arpa/inet.h>
 
-#include <netatalk/endian.h>
 #include <atalk/cnid.h>
 
 extern struct _cnid_module cnid_dbd_module;
 extern struct _cnid_db *cnid_dbd_open (struct cnid_open_args *args);
 extern void   cnid_dbd_close      (struct _cnid_db *);
-extern cnid_t cnid_dbd_add        (struct _cnid_db *, const struct stat *, const cnid_t,
-                                   char *, const size_t, cnid_t);
-extern cnid_t cnid_dbd_get        (struct _cnid_db *, const cnid_t, char *, const size_t); 
+extern cnid_t cnid_dbd_add        (struct _cnid_db *, const struct stat *, cnid_t,
+                                   const char *, size_t, cnid_t);
+extern cnid_t cnid_dbd_get        (struct _cnid_db *, cnid_t, const char *, size_t); 
 extern char  *cnid_dbd_resolve    (struct _cnid_db *, cnid_t *, void *, size_t ); 
 extern int    cnid_dbd_getstamp   (struct _cnid_db *, void *, const size_t ); 
-extern cnid_t cnid_dbd_lookup     (struct _cnid_db *, const struct stat *, const cnid_t,
-                                   char *, const size_t);
-extern int    cnid_dbd_find       (struct _cnid_db *cdb, char *name, size_t namelen,
+extern cnid_t cnid_dbd_lookup     (struct _cnid_db *, const struct stat *, cnid_t,
+                                   const char *, size_t);
+extern int    cnid_dbd_find       (struct _cnid_db *cdb, const char *name, size_t namelen,
                                    void *buffer, size_t buflen);
-extern int    cnid_dbd_update     (struct _cnid_db *, const cnid_t, const struct stat *,
-                                   const cnid_t, char *, size_t);
+extern int    cnid_dbd_update     (struct _cnid_db *, cnid_t, const struct stat *,
+                                   cnid_t, const char *, size_t);
 extern int    cnid_dbd_delete     (struct _cnid_db *, const cnid_t);
 extern cnid_t cnid_dbd_rebuild_add(struct _cnid_db *, const struct stat *,
-                                   const cnid_t, char *, const size_t, cnid_t);
+                                   cnid_t, const char *, size_t, cnid_t);
 
 /* FIXME: These functions could be static in cnid_dbd.c */