Merge latest CNID DB code from HEAD.

[netatalk.git] / libatalk / cnid / cnid_get.c

diff --git a/libatalk/cnid/cnid_get.c b/libatalk/cnid/cnid_get.c
index a774ab35fdc8a09d9b5a6d55cdbd8c5c3ef6a744..3ff1423ba6a78af087117e00e98a81cd11132a7d 100644 (file)
--- a/libatalk/cnid/cnid_get.c
+++ b/libatalk/cnid/cnid_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_get.c,v 1.8 2001-10-18 02:30:45 jmarcus Exp $
+ * $Id: cnid_get.c,v 1.9.2.4 2002-02-09 20:29:02 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -21,43 +21,49 @@
 
 #include "cnid_private.h"
 
-/* return CNID for a given did/name */
+/* Return CNID for a given did/name. */
 cnid_t cnid_get(void *CNID, const cnid_t did, const char *name,
-               const int len) 
+                const int len)
 {
-  char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
-  CNID_private *db;
-  DBT key, data;
-  cnid_t id;
-  int rc = 0;
-
-  if (!(db = CNID) || (len > MAXPATHLEN))
-    return 0;
-
-  memset(&key, 0, sizeof(key));
-  memset(&data, 0, sizeof(data));
-
-  buf = start;
-  memcpy(buf, &did, sizeof(did));
-  buf += sizeof(did);
-  memcpy(buf, name, len);
-  *(buf + len) = '\0'; /* make sure to nul terminate. */
-  key.data = start;
-  key.size = CNID_DID_LEN + len + 1;
-
-  while ((rc = db->db_didname->get(db->db_didname, NULL,
-                                     &key, &data, 0))) {
-    if (rc == DB_LOCK_DEADLOCK) {
-      continue;
-       }
-
-    if (rc != DB_NOTFOUND)
-      syslog(LOG_ERR, "cnid_get: can't get CNID(%u:%s) (%d)", did, name, rc);
-
-    return 0;
-  }
-
-  memcpy(&id, data.data, sizeof(id));
-  return id;
+    char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
+    CNID_private *db;
+    DBT key, data;
+    cnid_t id;
+    int rc;
+
+    if (!(db = CNID) || (len > MAXPATHLEN)) {
+        return 0;
+    }
+
+    memset(&key, 0, sizeof(key));
+    memset(&data, 0, sizeof(data));
+
+    buf = start;
+    memcpy(buf, &did, sizeof(did));
+    buf += sizeof(did);
+    memcpy(buf, name, len);
+    *(buf + len) = '\0'; /* Make it a C-string. */
+    key.data = start;
+    key.size = CNID_DID_LEN + len + 1;
+
+    while ((rc = db->db_didname->get(db->db_didname, NULL, &key, &data, 0))) {
+        if (rc == DB_LOCK_DEADLOCK) {
+            continue;
+        }
+
+        if (rc != DB_NOTFOUND) {
+            syslog(LOG_ERR, "cnid_get: Unable to get CNID %u, name %s: %s",
+                ntohl(did), name, db_strerror(rc));
+        }
+
+        return 0;
+    }
+
+    memcpy(&id, data.data, sizeof(id));
+#ifdef DEBUG
+    syslog(LOG_INFO, "cnid_get: Returning CNID for %u, name %s as %u",
+        ntohl(did), name, ntohl(id));
+#endif
+    return id;
 }
 #endif /* CNID_DB */