Big commit to improve CNID DB resiliency. Most of the source files have

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

diff --git a/libatalk/cnid/cnid_resolve.c b/libatalk/cnid/cnid_resolve.c
index ce79ac184bcca4686c872c82d80cd262fe2ae0e6..95574fe38f9e0559c56375917e10db1b55ebd17d 100644 (file)
--- a/libatalk/cnid/cnid_resolve.c
+++ b/libatalk/cnid/cnid_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_resolve.c,v 1.7 2001-10-18 02:30:45 jmarcus Exp $
+ * $Id: cnid_resolve.c,v 1.8 2001-10-21 08:33:33 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -21,34 +21,40 @@
 
 #include "cnid_private.h"
 
-/* return the did/name pair corresponding to a CNID. */
-char *cnid_resolve(void *CNID, cnid_t *id)
-{
-  CNID_private *db;
-  DBT key, data;
-  int rc = 0;
-
-  if (!(db = CNID) || !id || !(*id))
-    return NULL;
-
-  memset(&key, 0, sizeof(key));
-  memset(&data, 0, sizeof(data));
-
-  key.data = id;
-  key.size = sizeof(cnid_t);
-  while ((rc = db->db_cnid->get(db->db_cnid, NULL, &key, &data, 0))) {
-    if (rc == DB_LOCK_DEADLOCK) {
-      continue;
-    }
-
-    if (rc != DB_NOTFOUND) 
-      syslog(LOG_ERR, "cnid_resolve: can't get did/name (%d)", rc);
-
-    *id = 0;
-    return NULL;
-  }
-  
-  memcpy(id, (char *) data.data + CNID_DEVINO_LEN, sizeof(cnid_t));
-  return (char *) data.data + CNID_HEADER_LEN;
+/* Return the did/name pair corresponding to a CNID. */
+char *cnid_resolve(void *CNID, cnid_t *id) {
+       CNID_private *db;
+       DBT key, data;
+       int rc;
+
+       if (!(db = CNID) || !id || !(*id)) {
+               return NULL;
+       }
+
+       memset(&key, 0, sizeof(key));
+       memset(&data, 0, sizeof(data));
+
+       key.data = id;
+       key.size = sizeof(cnid_t);
+       while ((rc = db->db_cnid->get(db->db_cnid, NULL, &key, &data, 0))) {
+               if (rc == DB_LOCK_DEADLOCK) {
+                       continue;
+               }
+
+               if (rc != DB_NOTFOUND) {
+                       syslog(LOG_ERR, "cnid_resolve: Unable to get did/name: %s",
+                              db_strerror(rc));
+               }
+
+               *id = 0;
+               return NULL;
+       }
+
+       memcpy(id, (char *)data.data + CNID_DEVINO_LEN, sizeof(cnid_t));
+#ifdef DEBUG
+       syslog(LOG_INFO, "cnid_resolve: Returning id = %u, did/name = %s",
+              ntohl(*id), (char *)data.data + CNID_HEADER_LEN);
+#endif
+       return (char *)data.data + CNID_HEADER_LEN;
 }
 #endif /* CNID_DB */