code cleaning (header) from Bjorn

diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c
index 2c5f220e7c849769ea0b33a33ef10d9aaf96751c..b9b99020c4f6522fd8657d210fe0188deabd365b 100644 (file)
--- a/etc/cnid_dbd/dbd_add.c
+++ b/etc/cnid_dbd/dbd_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_add.c,v 1.1.4.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: dbd_add.c,v 1.1.4.2 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -24,7 +24,11 @@
 #include <atalk/logger.h>
 #include <atalk/cnid_dbd_private.h>
 #include <atalk/cnid.h>
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 
 #include "dbif.h"
 #include "pack.h"

diff --git a/etc/cnid_dbd/dbd_delete.c b/etc/cnid_dbd/dbd_delete.c
index 0c0f56df41aeea2c3a17c73dcab6a01cc85b8346..d166d26cb84e9def13a7e84f4263ab972cd2448c 100644 (file)
--- a/etc/cnid_dbd/dbd_delete.c
+++ b/etc/cnid_dbd/dbd_delete.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_delete.c,v 1.1.4.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: dbd_delete.c,v 1.1.4.2 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -13,7 +13,11 @@
 #include <errno.h>
 #include <atalk/logger.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/cnid_dbd_private.h>
 

diff --git a/etc/cnid_dbd/dbd_get.c b/etc/cnid_dbd/dbd_get.c
index 6f0353a13e4b51735813499f0cc216be25a45ddd..cf72a476c054dd3cdb6907b6306d9189d600365e 100644 (file)
--- a/etc/cnid_dbd/dbd_get.c
+++ b/etc/cnid_dbd/dbd_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_get.c,v 1.1.4.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: dbd_get.c,v 1.1.4.2 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -14,7 +14,11 @@
 #include <atalk/logger.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/cnid_dbd_private.h>
 

diff --git a/etc/cnid_dbd/dbd_lookup.c b/etc/cnid_dbd/dbd_lookup.c
index ff5cda8c017e947210635535bf270a0efac40869..f08ed64e822cd55e3113eb66ce6ef7005e83d96e 100644 (file)
--- a/etc/cnid_dbd/dbd_lookup.c
+++ b/etc/cnid_dbd/dbd_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_lookup.c,v 1.1.4.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: dbd_lookup.c,v 1.1.4.2 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -16,7 +16,11 @@
 #include <atalk/logger.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/cnid_dbd_private.h>
 

diff --git a/etc/cnid_dbd/dbd_resolve.c b/etc/cnid_dbd/dbd_resolve.c
index e8097093e69fee917b84921147dbb7edff824fbf..5c25ce8c8e1dffa15706595627f46b142baad7d5 100644 (file)
--- a/etc/cnid_dbd/dbd_resolve.c
+++ b/etc/cnid_dbd/dbd_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_resolve.c,v 1.1.4.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: dbd_resolve.c,v 1.1.4.2 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -13,7 +13,11 @@
 #include <atalk/logger.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/cnid_dbd_private.h>
 

diff --git a/etc/cnid_dbd/dbd_update.c b/etc/cnid_dbd/dbd_update.c
index 46b520a80ea92e8073e676ac33978a000fb43926..8d113c463146fc07c1ceabad4c0675384d9bc3cd 100644 (file)
--- a/etc/cnid_dbd/dbd_update.c
+++ b/etc/cnid_dbd/dbd_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_update.c,v 1.1.4.2 2003-10-06 15:17:08 didg Exp $
+ * $Id: dbd_update.c,v 1.1.4.3 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -13,7 +13,11 @@
 #include <errno.h>
 #include <atalk/logger.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/cnid_dbd_private.h>
 

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 8c4f95d0fb40712719ffebc3b03f24e4feca6c7f..54afab6b8d6fded0c7c16d603802619cac4ef416 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbif.c,v 1.1.4.3 2003-10-06 15:17:08 didg Exp $
+ * $Id: dbif.c,v 1.1.4.4 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,7 +12,11 @@
 #include <stdio.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <atalk/logger.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/etc/cnid_dbd/dbif.h b/etc/cnid_dbd/dbif.h
index e8901016ea3a317cd0b64ef3c03b11ffb63d642e..ef68fcaf863658e0cb2f8fa7c21caf388b027d1e 100644 (file)
--- a/etc/cnid_dbd/dbif.h
+++ b/etc/cnid_dbd/dbif.h
@@ -1,5 +1,5 @@
 /*
- * $Id: dbif.h,v 1.1.4.2 2003-10-06 15:17:08 didg Exp $
+ * $Id: dbif.h,v 1.1.4.3 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -8,7 +8,11 @@
 #ifndef CNID_DBD_DBIF_H
 #define CNID_DBD_DBIF_H 1
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include "db_param.h"
 
 #define DBIF_DB_CNT 3

diff --git a/etc/cnid_dbd/pack.c b/etc/cnid_dbd/pack.c
index 161f8b3b47d9bef8e4417d3d9e58ca3537443e96..9671e482f83a83be05dfed5767f284923946846e 100644 (file)
--- a/etc/cnid_dbd/pack.c
+++ b/etc/cnid_dbd/pack.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.c,v 1.1.4.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: pack.c,v 1.1.4.2 2003-10-21 16:24:58 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYRIGHT.
@@ -9,12 +9,16 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <db.h>
 #include <string.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
 #include <sys/param.h>
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
+#include <db.h>
+#endif
 
 #include <atalk/cnid_dbd_private.h>
 #include <netatalk/endian.h>

diff --git a/libatalk/cnid/cdb/cnid_cdb_add.c b/libatalk/cnid/cdb/cnid_cdb_add.c
index 6604401d7f4ca886df056401d372cc57a42068a4..bfe991dffe235282fb1b2b2e9e5c6e3e5f3d2fd2 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_add.c
+++ b/libatalk/cnid/cdb/cnid_cdb_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_add.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_add.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -14,33 +14,9 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <errno.h>
-#include <atalk/logger.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-
-#include <db.h>
-#include <netatalk/endian.h>
-
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-#include <atalk/util.h>
-
 #include "cnid_cdb_private.h"
 
-    #define tid    NULL
+#define tid    NULL
 
 #ifdef ATACC
 char *make_cnid_data(const struct stat *st,const cnid_t did,

diff --git a/libatalk/cnid/cdb/cnid_cdb_close.c b/libatalk/cnid/cdb/cnid_cdb_close.c
index a777319f83c1323116d7f832cea4d3dd87793cf3..24b067fd8b90cf02ab3bca74c7ea592bafa76b0d 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_close.c
+++ b/libatalk/cnid/cdb/cnid_cdb_close.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_close.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_close.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,21 +7,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <stdlib.h>
-#include <atalk/logger.h>
-#include <db.h>
-#include <errno.h>
-#include <string.h>
-
 #include "cnid_cdb_private.h"
-#include "cnid_cdb.h"
 
 void cnid_cdb_close(struct _cnid_db *cdb) {
     CNID_private *db;

diff --git a/libatalk/cnid/cdb/cnid_cdb_delete.c b/libatalk/cnid/cdb/cnid_cdb_delete.c
index 5281b125a8112719b02fededc09424d45fb513df..23a1062aeb85bfb14a113f74d50e156a2fe42e99 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_delete.c
+++ b/libatalk/cnid/cdb/cnid_cdb_delete.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_delete.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_delete.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -12,17 +12,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <atalk/logger.h>
-
-#include <db.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-
 #include "cnid_cdb_private.h"
 
 #define tid    NULL

diff --git a/libatalk/cnid/cdb/cnid_cdb_get.c b/libatalk/cnid/cdb/cnid_cdb_get.c
index c6d538b16d6e76b6224215a397ea4107a715b1a8..e73a1694267dfbe2879b8175b2c29f6a0d3c583c 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_get.c
+++ b/libatalk/cnid/cdb/cnid_cdb_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_get.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_get.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,19 +7,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atalk/logger.h>
-#include <errno.h>
-
-#include <db.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-
 #include "cnid_cdb_private.h"
 
 /* Return CNID for a given did/name. */

diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c
index 443c9eb84b7d2e188f7ea590449c0f989d269db5..a45aba793e9ca465b717e9e5b1f196b39fc6186f 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_lookup.c
+++ b/libatalk/cnid/cdb/cnid_cdb_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_lookup.c,v 1.1.4.2 2003-10-06 15:17:08 didg Exp $
+ * $Id: cnid_cdb_lookup.c,v 1.1.4.3 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,19 +7,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atalk/logger.h>
-#include <errno.h>
-
-#include <db.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-
 #include "cnid_cdb_private.h"
 
 #define LOGFILEMAX    100  /* kbytes */

diff --git a/libatalk/cnid/cdb/cnid_cdb_nextid.c b/libatalk/cnid/cdb/cnid_cdb_nextid.c
index e392f9d1eff897dd8deca6dd0903e1cc8845efb5..f98e210bca6cf4c45dfd54479a1a775b3a3f3df6 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_nextid.c
+++ b/libatalk/cnid/cdb/cnid_cdb_nextid.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_nextid.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_nextid.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -9,14 +9,6 @@
 #ifdef CNID_BACKEND_CDB
 
 #ifdef unused
-
-#include <db.h>
-
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-
-#include <atalk/logger.h>
-
 #include "cnid_cdb_private.h"
 
 /* return the next id. we use the fact that ad files are memory
@@ -34,4 +26,4 @@ cnid_t cnid_cdb_nextid(struct _cnid_db *cdb)
 }
 #endif
 
-#endif /* CNID_BACKEND_CDB */
\ No newline at end of file
+#endif /* CNID_BACKEND_CDB */

diff --git a/libatalk/cnid/cdb/cnid_cdb_open.c b/libatalk/cnid/cdb/cnid_cdb_open.c
index f0863e7b6f85209409b022cd604fb97806dcccd4..bd2dbb7c7404fd0bab41eff5cb0bd91ab521b2f6 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_open.c
+++ b/libatalk/cnid/cdb/cnid_cdb_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_cdb_open.c,v 1.1.4.3 2003-10-06 15:17:08 didg Exp $
+ * $Id: cnid_cdb_open.c,v 1.1.4.4 2003-10-21 16:23:54 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -40,30 +40,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atalk/logger.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-
-#include <db.h>
-
-#include <atalk/adouble.h>
-#include <atalk/cnid.h>
-#include "cnid_cdb.h"
-#include <atalk/util.h>
-
 #include "cnid_cdb_private.h"
 
 #ifndef MIN

diff --git a/libatalk/cnid/cdb/cnid_cdb_private.h b/libatalk/cnid/cdb/cnid_cdb_private.h
index 4f4453adbe6718ab88b13f30b53cccf10865d086..1662fdc761d9ff950f3ed3e70fc6085062ffa410 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_private.h
+++ b/libatalk/cnid/cdb/cnid_cdb_private.h
@@ -1,20 +1,40 @@
 /*
- * $Id: cnid_cdb_private.h,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_private.h,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifndef LIBATALK_CDB_PRIVATE_H
 #define LIBATALK_CDB_PRIVATE_H 1
 
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
+#include <sys/param.h>
+#include <sys/stat.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif /* HAVE_SYS_TIME_H */
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 
+#include <netatalk/endian.h>
+#include <atalk/logger.h>
 #include <atalk/adouble.h>
+#include <atalk/cnid.h>
+#include <atalk/util.h>
 #include "cnid_cdb.h"
 
 #define CNID_DB_MAGIC   0x434E4944U  /* CNID */

diff --git a/libatalk/cnid/cdb/cnid_cdb_resolve.c b/libatalk/cnid/cdb/cnid_cdb_resolve.c
index 0994a2b7f900cd6d77078b4b72307bdd5dac0266..98fea10d9c48282262694677d440e06b565e084f 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_resolve.c
+++ b/libatalk/cnid/cdb/cnid_cdb_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_resolve.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_cdb_resolve.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,19 +7,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atalk/logger.h>
-#include <errno.h>
-
-#include <db.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-
 #include "cnid_cdb_private.h"
 
 /* Return the did/name pair corresponding to a CNID. */

diff --git a/libatalk/cnid/cdb/cnid_cdb_update.c b/libatalk/cnid/cdb/cnid_cdb_update.c
index 5d5d646e5b143f8e976036f14584b13735a80a39..b0f5c12a2f4856af49efab91a4a07266c0b3727a 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_update.c
+++ b/libatalk/cnid/cdb/cnid_cdb_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_update.c,v 1.1.4.3 2003-10-06 15:17:08 didg Exp $
+ * $Id: cnid_cdb_update.c,v 1.1.4.4 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -7,19 +7,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #ifdef CNID_BACKEND_CDB
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <atalk/logger.h>
-
-#include <db.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include "cnid_cdb.h"
-
 #include "cnid_cdb_private.h"
 
 #define tid    NULL

diff --git a/libatalk/cnid/db3/cnid_db3_add.c b/libatalk/cnid/db3/cnid_db3_add.c
index 87988755dc91482a6b5f655064455b734172d6e2..340c81bdf2700164359a68e745d354944edb09d7 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_add.c
+++ b/libatalk/cnid/db3/cnid_db3_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_add.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_add.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -31,7 +31,11 @@
 #include <sys/time.h>
 #endif /* HAVE_SYS_TIME_H */
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 
 #include <atalk/adouble.h>

diff --git a/libatalk/cnid/db3/cnid_db3_close.c b/libatalk/cnid/db3/cnid_db3_close.c
index b17d4ee3c6662d53915a9b64aa4529c61e9c69b9..7b6cd99554ad6171982455ed7d4b5a1541e318b5 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_close.c
+++ b/libatalk/cnid/db3/cnid_db3_close.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_close.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_close.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -16,7 +16,11 @@
 #endif /* HAVE_FCNTL_H */
 #include <stdlib.h>
 #include <atalk/logger.h>
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <errno.h>
 #include <string.h>
 

diff --git a/libatalk/cnid/db3/cnid_db3_delete.c b/libatalk/cnid/db3/cnid_db3_delete.c
index e7c544b1fb628d34b1725207ff939a2b54a56f6f..8ba74fe50449e49765668b530f81d64c766358b9 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_delete.c
+++ b/libatalk/cnid/db3/cnid_db3_delete.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_delete.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_delete.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -18,7 +18,11 @@
 #include <errno.h>
 #include <atalk/logger.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
 #include "cnid_db3.h"

diff --git a/libatalk/cnid/db3/cnid_db3_get.c b/libatalk/cnid/db3/cnid_db3_get.c
index 35d643a203d0f2ab627759b80f0e43015ee5359f..14e574d343812f614c6af438942392fd17a46de6 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_get.c
+++ b/libatalk/cnid/db3/cnid_db3_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_get.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_get.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,7 +15,11 @@
 #include <atalk/logger.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
 #include "cnid_db3.h"

diff --git a/libatalk/cnid/db3/cnid_db3_lookup.c b/libatalk/cnid/db3/cnid_db3_lookup.c
index 9a29e79764d67761507d79d4fbaa9660d69db4ca..3d77d123dc621305076ab34158095a07b5d6450d 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_lookup.c
+++ b/libatalk/cnid/db3/cnid_db3_lookup.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_lookup.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_lookup.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -16,7 +16,11 @@
 #include <atalk/logger.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
 #include "cnid_db3.h"

diff --git a/libatalk/cnid/db3/cnid_db3_nextid.c b/libatalk/cnid/db3/cnid_db3_nextid.c
index 70a136060d38fbffc7ee41606fd78f65e2291e7f..ded384ab49f15fb421db2a224ffc0ef507f77efd 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_nextid.c
+++ b/libatalk/cnid/db3/cnid_db3_nextid.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_nextid.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_nextid.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -9,7 +9,11 @@
 
 #ifdef unused
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 
 #include <atalk/adouble.h>
 #include "cnid_db3.h"

diff --git a/libatalk/cnid/db3/cnid_db3_open.c b/libatalk/cnid/db3/cnid_db3_open.c
index 2785d158790748f531cb5bbec2fc4db2313439ee..1d60987d3f66865dcba8e9ea327c0760415f0d23 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_open.c
+++ b/libatalk/cnid/db3/cnid_db3_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_open.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_open.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -57,7 +57,11 @@
 #include <sys/time.h>
 #endif /* HAVE_SYS_TIME_H */
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 
 #include <atalk/adouble.h>
 #include <atalk/cnid.h>

diff --git a/libatalk/cnid/db3/cnid_db3_private.h b/libatalk/cnid/db3/cnid_db3_private.h
index 7ee61932ee03ec09206f1eff9762f4a2f792507d..70b7af60380764274a355f4f00dcdc3c2e5c55a7 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_private.h
+++ b/libatalk/cnid/db3/cnid_db3_private.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_private.h,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_private.h,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifndef LIBATALK_CNID_PRIVATE_H
@@ -12,7 +12,11 @@
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 
 #include <atalk/adouble.h>
 #include "cnid_db3.h"

diff --git a/libatalk/cnid/db3/cnid_db3_resolve.c b/libatalk/cnid/db3/cnid_db3_resolve.c
index d1ceba1c02dfc8b728632c80b0b78891bf188521..394c63806af82b09a8045d60568a830ed2794f19 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_resolve.c
+++ b/libatalk/cnid/db3/cnid_db3_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_resolve.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_resolve.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,7 +15,11 @@
 #include <atalk/logger.h>
 #include <errno.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
 #include "cnid_db3.h"

diff --git a/libatalk/cnid/db3/cnid_db3_update.c b/libatalk/cnid/db3/cnid_db3_update.c
index 1d71d27632ff98f93c257b7cba4f44a9fa47a081..1a2251e3301d885babd09e514a2d21dcffd4d21b 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_update.c
+++ b/libatalk/cnid/db3/cnid_db3_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_update.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_db3_update.c,v 1.1.4.2 2003-10-21 16:23:54 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,7 +15,11 @@
 #include <errno.h>
 #include <atalk/logger.h>
 
+#ifdef HAVE_DB4_DB_H
+#include <db4/db.h>
+#else
 #include <db.h>
+#endif
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
 #include "cnid_db3.h"