Style police.

diff --git a/libatalk/cnid/cnid_close.c b/libatalk/cnid/cnid_close.c
index 5edd65d8ba65141e2e595fbffc40eeae028a0266..e15b285ecf4d506ef5247636d4ed64d93bb5feac 100644 (file)
--- a/libatalk/cnid/cnid_close.c
+++ b/libatalk/cnid/cnid_close.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_close.c,v 1.19 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: cnid_close.c,v 1.20 2002-01-19 21:42:08 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -57,7 +57,7 @@ void cnid_close(void *CNID) {
                 if ((rc = log_archive(db->dbenv, &list, DB_ARCH_LOG | DB_ARCH_ABS, NULL)) != 0) {
 #endif /* DB_VERSION_MINOR */
                     LOG(log_error, logtype_default, "cnid_close: Unable to archive logfiles: %s",
-                           db_strerror(rc));
+                        db_strerror(rc));
                 }
 
                 if (list != NULL) {
@@ -65,7 +65,7 @@ void cnid_close(void *CNID) {
                         if ((rc = remove(*list)) != 0) {
 #ifdef DEBUG
                             LOG(log_info, logtype_default, "cnid_close: failed to remove %s: %s",
-                                   *list, strerror(rc));
+                                *list, strerror(rc));
 #endif
                         }
                     }

diff --git a/libatalk/cnid/cnid_delete.c b/libatalk/cnid/cnid_delete.c
index 038847d48005b88da57cc4de28c0c31a993cb957..e01beab028ca7f310f39f1deef22845fa3a9ab2b 100644 (file)
--- a/libatalk/cnid/cnid_delete.c
+++ b/libatalk/cnid/cnid_delete.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_delete.c,v 1.12 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: cnid_delete.c,v 1.13 2002-01-19 21:42:08 jmarcus Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -51,12 +51,12 @@ int cnid_delete(void *CNID, const cnid_t id) {
         case DB_NOTFOUND:
 #ifdef DEBUG
             LOG(log_info, logtype_default, "cnid_delete: CNID %u not in database",
-                   ntohl(id));
+                ntohl(id));
 #endif
             return 0;
         default:
             LOG(log_error, logtype_default, "cnid_delete: Unable to delete entry: %s",
-                   db_strerror(rc));
+                db_strerror(rc));
             return rc;
         }
     }
@@ -64,7 +64,7 @@ int cnid_delete(void *CNID, const cnid_t id) {
 retry:
     if ((rc = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
         LOG(log_error, logtype_default, "cnid_delete: Failed to begin transaction: %s",
-               db_strerror(rc));
+            db_strerror(rc));
         return rc;
     }
 
@@ -93,7 +93,7 @@ retry:
         case DB_LOCK_DEADLOCK:
             if ((rc = txn_abort(tid)) != 0) {
                 LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s",
-                       db_strerror(rc));
+                    db_strerror(rc));
                 return rc;
             }
             goto retry;
@@ -103,7 +103,7 @@ retry:
         default:
             if ((rc = txn_abort(tid)) != 0) {
                 LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s",
-                       db_strerror(rc));
+                    db_strerror(rc));
                 return rc;
             }
             goto abort_err;
@@ -119,7 +119,7 @@ retry:
         case DB_LOCK_DEADLOCK:
             if ((rc = txn_abort(tid)) != 0) {
                 LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s",
-                       db_strerror(rc));
+                    db_strerror(rc));
                 return rc;
             }
             goto retry;
@@ -128,7 +128,7 @@ retry:
         default:
             if ((rc = txn_abort(tid)) != 0) {
                 LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s",
-                       db_strerror(rc));
+                    db_strerror(rc));
                 return rc;
             }
             goto abort_err;
@@ -140,14 +140,14 @@ retry:
 #endif
     if ((rc = txn_commit(tid, 0)) != 0) {
         LOG(log_error, logtype_default, "cnid_delete: Failed to commit transaction: %s",
-               db_strerror(rc));
+            db_strerror(rc));
         return rc;
     }
     return 0;
 
 abort_err:
     LOG(log_error, logtype_default, "cnid_delete: Unable to delete CNID %u: %s",
-           ntohl(id), db_strerror(rc));
+        ntohl(id), db_strerror(rc));
     return rc;
 }
 #endif /*CNID_DB */

diff --git a/libatalk/cnid/cnid_get.c b/libatalk/cnid/cnid_get.c
index 07618c2f10b45ab348d76d974805207ef918a9fe..018fe1a35f1d49f152ea7b14292b2f9fdc601378 100644 (file)
--- a/libatalk/cnid/cnid_get.c
+++ b/libatalk/cnid/cnid_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_get.c,v 1.11 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: cnid_get.c,v 1.12 2002-01-19 21:42:08 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,7 +53,7 @@ cnid_t cnid_get(void *CNID, const cnid_t did, const char *name,
 
         if (rc != DB_NOTFOUND) {
             LOG(log_error, logtype_default, "cnid_get: Unable to get CNID %u, name %s: %s",
-                   ntohl(did), name, db_strerror(rc));
+                ntohl(did), name, db_strerror(rc));
         }
 
         return 0;
@@ -62,7 +62,7 @@ cnid_t cnid_get(void *CNID, const cnid_t did, const char *name,
     memcpy(&id, data.data, sizeof(id));
 #ifdef DEBUG
     LOG(log_info, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u",
-           ntohl(did), name, ntohl(id));
+        ntohl(did), name, ntohl(id));
 #endif
     return id;
 }

diff --git a/libatalk/cnid/cnid_lookup.c b/libatalk/cnid/cnid_lookup.c
index a79d78460f4df2be13d91c687b2c7426885cc08d..bf1d4661a11f6898b9867f057a8c7b9972dfe65e 100644 (file)
--- a/libatalk/cnid/cnid_lookup.c
+++ b/libatalk/cnid/cnid_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_lookup.c,v 1.11 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: cnid_lookup.c,v 1.12 2002-01-19 21:42:08 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,7 +53,7 @@ cnid_t cnid_lookup(void *CNID, const struct stat *st, const cnid_t did,
             break;
         default:
             LOG(log_error, logtype_default, "cnid_lookup: txn_checkpoint: %s",
-                   db_strerror(rc));
+                db_strerror(rc));
             return 0;
         }
     }
@@ -82,7 +82,7 @@ cnid_t cnid_lookup(void *CNID, const struct stat *st, const cnid_t did,
         }
 
         LOG(log_error, logtype_default, "cnid_lookup: Unable to get CNID dev %u, ino %u: %s",
-               st->st_dev, st->st_ino, db_strerror(rc));
+            st->st_dev, st->st_ino, db_strerror(rc));
         return 0;
     }
 
@@ -100,7 +100,7 @@ cnid_t cnid_lookup(void *CNID, const struct stat *st, const cnid_t did,
         }
 
         LOG(log_error, logtype_default, "cnid_lookup: Unable to get CNID %u, name %s: %s",
-               ntohl(did), name, db_strerror(rc));
+            ntohl(did), name, db_strerror(rc));
         return 0;
     }
 
@@ -117,7 +117,7 @@ cnid_t cnid_lookup(void *CNID, const struct stat *st, const cnid_t did,
     if ((devino && didname) || !(devino || didname)) {
 #ifdef DEBUG
         LOG(log_info, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u",
-               ntohl(did), name, ntohl(id));
+            ntohl(did), name, ntohl(id));
 #endif
         return id;
     }

diff --git a/libatalk/cnid/cnid_resolve.c b/libatalk/cnid/cnid_resolve.c
index aaebde3de46e514daf50aebbe1fc8e83b606c607..5a115abaa8bef382a72741b2ea0e806af7358391 100644 (file)
--- a/libatalk/cnid/cnid_resolve.c
+++ b/libatalk/cnid/cnid_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_resolve.c,v 1.10 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: cnid_resolve.c,v 1.11 2002-01-19 21:42:08 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@ char *cnid_resolve(void *CNID, cnid_t *id) {
 
         if (rc != DB_NOTFOUND) {
             LOG(log_error, logtype_default, "cnid_resolve: Unable to get did/name: %s",
-                   db_strerror(rc));
+                db_strerror(rc));
         }
 
         *id = 0;
@@ -53,7 +53,7 @@ char *cnid_resolve(void *CNID, cnid_t *id) {
     memcpy(id, (char *)data.data + CNID_DEVINO_LEN, sizeof(cnid_t));
 #ifdef DEBUG
     LOG(log_info, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s",
-           ntohl(*id), (char *)data.data + CNID_HEADER_LEN);
+        ntohl(*id), (char *)data.data + CNID_HEADER_LEN);
 #endif
     return (char *)data.data + CNID_HEADER_LEN;
 }

diff --git a/libatalk/cnid/cnid_update.c b/libatalk/cnid/cnid_update.c
index 5cb033408d14cf2a7aaeb00db9b6ad1572568b10..8a588fcd1866661a29c28c5604326402ed409904 100644 (file)
--- a/libatalk/cnid/cnid_update.c
+++ b/libatalk/cnid/cnid_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_update.c,v 1.16 2002-01-04 04:45:48 sibaz Exp $
+ * $Id: cnid_update.c,v 1.17 2002-01-19 21:42:08 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
 retry:
     if ((rc = txn_begin(db->dbenv, NULL, &tid, 0))) {
         LOG(log_error, logtype_default, "cnid_update: Failed to begin transaction: %s",
-               db_strerror(rc));
+            db_strerror(rc));
         return rc;
     }
 
@@ -148,7 +148,7 @@ retry:
 
 update_err:
     LOG(log_error, logtype_default, "cnid_update: Unable to update CNID %u: %s",
-           ntohl(id), db_strerror(rc));
+        ntohl(id), db_strerror(rc));
     return -1;
 }
 #endif /* CNID_DB */