/*
- * $Id: cnid_db3_open.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_db3_open.c,v 1.5 2009-11-24 12:18:19 didg Exp $
*
* Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
#define MAXITER 0xFFFF /* maximum number of simultaneously open CNID
* databases. */
+#if 0
/* -----------------------
* bandaid for LanTest performance pb. for now not used, cf. ifdef 0 below
*/
ret = select(0, NULL, NULL, NULL, &t);
return 0;
}
+#endif
/* --------------- */
static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
#endif
}
-/* --------------- */
+#if 0
+/* ---------------
+ * XXX not used
+*/
/* the first compare that's always done. */
-static __inline__ int compare_did(const DBT * a, const DBT * b)
+static int compare_did(const DBT * a, const DBT * b)
{
u_int32_t dida, didb;
/* sort did's and then names. this is for unix paths.
* i.e., did/unixname lookups. */
#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
-static int compare_unix(DB * db, const DBT * a, const DBT * b)
+static int compare_unix(DB * db _U_, const DBT * a, const DBT * b)
#else /* DB_VERSION_MINOR < 1 */
static int compare_unix(const DBT * a, const DBT * b)
#endif /* DB_VERSION_MINOR */
* unicode table to work. also, we can't use strdiacasecmp as that
* returns a match if a < b. */
#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
-static int compare_mac(DB * db, const DBT * a, const DBT * b)
+static int compare_mac(DB * db _U_, const DBT * a, const DBT * b)
#else /* DB_VERSION_MINOR < 1 */
static int compare_mac(const DBT * a, const DBT * b)
#endif /* DB_VERSION_MINOR */
return a->size - b->size; /* sort by length */
}
-
/* for unicode names -- right now it's the same as compare_mac. */
#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
static int compare_unicode(DB * db, const DBT * a, const DBT * b)
return compare_mac(a, b);
#endif /* DB_VERSION_MINOR */
}
+#endif
static struct _cnid_db *cnid_db3_new(const char *volpath)
{
return cdb;
}
-struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask)
+struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask, u_int32_t flags _U_)
{
struct stat st;
struct flock lock;
fail_adouble:
- fail_db:
free(db);
fail_cdb: