Merge master

[netatalk.git] / libatalk / cnid / cdb / cnid_cdb_lookup.c

diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c
index a8d49f02bc6218dfcd0dcc2be3d5d6c535f206ef..7b2f933c5182b4e1c4d4974f5a46c3bd7aa695ac 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_lookup.c
+++ b/libatalk/cnid/cdb/cnid_cdb_lookup.c
@@ -1,7 +1,3 @@
-/*
- * $Id: cnid_cdb_lookup.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -14,10 +10,10 @@
 
 /* This returns the CNID corresponding to a particular file.  It will
  * also fix up the various databases if there's a problem. */
-cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                   char *name, const int len)
+cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, cnid_t did,
+                       const char *name, size_t len)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, devdata, diddata;
     char dev[CNID_DEV_LEN];
@@ -34,7 +30,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t
         return 0;
     }
     
-    if ((buf = make_cnid_data(st, did, name, len)) == NULL) {
+    if ((buf = make_cnid_data(cdb->flags, st, did, name, len)) == NULL) {
         LOG(log_error, logtype_default, "cnid_lookup: Pathname is too long");
         return 0;
     }
@@ -67,7 +63,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t
         type_devino = ntohl(type_devino);
     }
 
-    buf = make_cnid_data(st, did, name, len);
+    buf = make_cnid_data(cdb->flags, st, did, name, len);
     key.data = buf +CNID_DID_OFS;
     key.size = CNID_DID_LEN + len + 1;
     
@@ -132,7 +128,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t
     cnid_cdb_update(cdb, id, st, did, name, len);
 
 #ifdef DEBUG
-    LOG(log_info, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, ntohl(id));
+    LOG(log_debug9, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, ntohl(id));
 #endif
     return id;
 }