Merge remote branch 'sf/product-2-2' into develop

[netatalk.git] / libatalk / cnid / tdb / cnid_tdb_get.c

diff --git a/libatalk/cnid/tdb/cnid_tdb_get.c b/libatalk/cnid/tdb/cnid_tdb_get.c
index 7e31151d4e66e15b5b4b513526b3c4fc2166b130..8321d04e868eb20469c061bd08c0057c7dacc7ae 100644 (file)
--- a/libatalk/cnid/tdb/cnid_tdb_get.c
+++ b/libatalk/cnid/tdb/cnid_tdb_get.c
@@ -1,7 +1,3 @@
-/*
- * $Id: cnid_tdb_get.c,v 1.3 2005-05-03 14:55:15 didg Exp $
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -11,9 +7,9 @@
 #include "cnid_tdb.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
+cnid_t cnid_tdb_get(struct _cnid_db *cdb, cnid_t did, const char *name, size_t len)
 {
-    char start[TDB_DID_LEN + MAXPATHLEN + 1], *buf;
+    char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
     struct _cnid_tdb_private *db;
     TDB_DATA key, data;
     cnid_t id;
@@ -31,7 +27,7 @@ cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const si
     memcpy(buf, name, len);
     *(buf + len) = '\0'; /* Make it a C-string. */
     key.dptr = start;
-    key.dsize = TDB_DID_LEN + len + 1;
+    key.dsize = CNID_DID_LEN + len + 1;
     data = tdb_fetch(db->tdb_didname, key);
     if (!data.dptr)
         return 0;