More instances of s/errno/rc/

diff --git a/libatalk/cnid/cnid_delete.c b/libatalk/cnid/cnid_delete.c
index e08a3073ea99b9512df778ea554807ecd62a0033..982b3cbfde0bf649766d5723891af29ccf3aa4c9 100644 (file)
--- a/libatalk/cnid/cnid_delete.c
+++ b/libatalk/cnid/cnid_delete.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_delete.c,v 1.6 2001-08-31 14:58:48 rufustfirefly Exp $
+ * $Id: cnid_delete.c,v 1.7 2001-09-20 06:10:42 jmarcus Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -29,6 +29,7 @@ int cnid_delete(void *CNID, const cnid_t id)
   CNID_private *db;
   DBT key, data;
   DB_TXN *tid;
+  int rc = 0;
 
   if (!(db = CNID) || !id || (db->flags & CNIDFLAG_DB_RO))
     return -1;
@@ -38,16 +39,16 @@ int cnid_delete(void *CNID, const cnid_t id)
 
 
 retry:
-  if ((errno = txn_begin(db->dbenv, NULL, &tid, 0))) {
-    return errno;
+  if ((rc = txn_begin(db->dbenv, NULL, &tid, 0))) {
+    return rc;
   }
 
   /* get from main database */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    switch (errno) {
+    switch (rc) {
        case DB_LOCK_DEADLOCK:
       goto retry;
       
@@ -56,21 +57,21 @@ retry:
       return 0;
     default:
       syslog(LOG_ERR, "cnid_delete: can't delete entry");
-      return errno;
+      return rc;
     }
   }
   
   /* now delete from dev/ino database */
   key.data = data.data;
   key.size = CNID_DEVINO_LEN;
-  if ((errno = db->db_devino->del(db->db_devino, tid, &key, 0))) {
-    if (errno == DB_LOCK_DEADLOCK) {
+  if ((rc = db->db_devino->del(db->db_devino, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* be silent if there isn't an entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto abort_err;
     }
@@ -82,14 +83,14 @@ retry:
   /* delete from did/name database */
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->del(db->db_didname, tid, &key, 0))) {
-    if (errno == DB_LOCK_DEADLOCK) {
+  if ((rc = db->db_didname->del(db->db_didname, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
     
     /* be silent if there isn't an entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto abort_err;
     }
@@ -98,9 +99,9 @@ retry:
   /* now delete from main database */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->del(db->db_cnid, tid, &key, 0))) {
+  if ((rc = db->db_cnid->del(db->db_cnid, tid, &key, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto abort_err;
@@ -110,6 +111,6 @@ retry:
 
 abort_err:
   syslog(LOG_ERR, "cnid_del: unable to delete CNID(%x)", id);
-  return errno;
+  return rc;
 }
 #endif /* CNID_DB */

diff --git a/libatalk/cnid/cnid_update.c b/libatalk/cnid/cnid_update.c
index 3f007f64772b1401b77e2ae89363298d709a70c5..e7c320852bfa29717c787678446f5647220909d6 100644 (file)
--- a/libatalk/cnid/cnid_update.c
+++ b/libatalk/cnid/cnid_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_update.c,v 1.6 2001-08-31 14:58:48 rufustfirefly Exp $
+ * $Id: cnid_update.c,v 1.7 2001-09-20 06:07:12 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,6 +32,7 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
   CNID_private *db;
   DBT key, data, altdata;
   DB_TXN *tid;
+  int rc = 0;
   
   if (!(db = CNID) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO))
     return -1;
@@ -42,16 +43,16 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
 
   /* begin a transaction */
 retry:
-  if ((errno = txn_begin(db->dbenv, NULL, &tid, 0))) {
-    return errno;
+  if ((rc = txn_begin(db->dbenv, NULL, &tid, 0))) {
+    return rc;
   }
 
   /* get the old info */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK)
+    if (rc == DB_LOCK_DEADLOCK)
       goto retry;
     goto update_err;
   }
@@ -59,14 +60,14 @@ retry:
   /* delete the old dev/ino mapping */
   key.data = data.data;
   key.size = CNID_DEVINO_LEN;
-  if ((errno = db->db_devino->del(db->db_devino, tid, &key, 0))) {
-    if (errno == DB_LOCK_DEADLOCK) {
+  if ((rc = db->db_devino->del(db->db_devino, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* silently fail on a non-existent entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto update_err;
     }
@@ -75,14 +76,14 @@ retry:
   /* delete the old did/name mapping */
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->del(db->db_didname, tid, &key, 0))) {
-    if (errno == DB_LOCK_DEADLOCK) {
+  if ((rc = db->db_didname->del(db->db_didname, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* silently fail on a non-existent entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto update_err;
     }
@@ -100,9 +101,9 @@ retry:
   key.size = CNID_DEVINO_LEN;
   altdata.data = (cnid_t *) &id;
   altdata.size = sizeof(id);
-  if ((errno = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) {
+  if ((rc = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
@@ -111,9 +112,9 @@ retry:
   /* put a new did/name mapping in */
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) {
+  if ((rc = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
@@ -122,9 +123,9 @@ retry:
   /* update the old CNID with the new info */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;