Merge 2-1

[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 20a737c9b95b29375f92540270c821f31468843e..1f645908358b442633beae7e730e9789be690975 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.h
+++ b/libatalk/cnid/dbd/cnid_dbd.h
@@ -1,7 +1,6 @@
 /*
- * $Id: cnid_dbd.h,v 1.5 2009-11-24 12:18:19 didg Exp $
- *
  * Copyright (C) Joerg Lenneis 2003
+ * Copyright (C) Frank Lahm 2010
  * All Rights Reserved.  See COPYING.
  */
 
@@ -18,20 +17,22 @@
 #include <atalk/cnid.h>
 
 extern struct _cnid_module cnid_dbd_module;
-extern struct _cnid_db *cnid_dbd_open (const char *, mode_t, u_int32_t flags);
-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 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_update (struct _cnid_db *, const cnid_t, const struct stat *,
-                           const cnid_t, 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);
+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 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,
+                                   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_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);
 
 /* FIXME: These functions could be static in cnid_dbd.c */