diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:45:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:45:13 +0930 |
| commit | 77d7ff6c34f16dec70da3f3abc1c19d217e944a9 (patch) | |
| tree | f4d1d7c3e4e489dda24ae21950aa32b4ba6c0f9e /lib/tdb2/open.c | |
| parent | 75d69ce4f7135fa82d1743fdb61e37ee0bbc1508 (diff) | |
| download | samba-77d7ff6c34f16dec70da3f3abc1c19d217e944a9.tar.gz samba-77d7ff6c34f16dec70da3f3abc1c19d217e944a9.tar.bz2 samba-77d7ff6c34f16dec70da3f3abc1c19d217e944a9.zip | |
tdb2: make jenkins_hash function non-static, rename to tdb_jenkins_hash.
We're going to need access to it from tdb1_open, so expose it now.
It's better in hash.c anyway.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit c8f6f8c2dea76042f74c02eff048847e62adcca6)
Diffstat (limited to 'lib/tdb2/open.c')
| -rw-r--r-- | lib/tdb2/open.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/tdb2/open.c b/lib/tdb2/open.c index 94f09e7a2f..a9df85758d 100644 --- a/lib/tdb2/open.c +++ b/lib/tdb2/open.c @@ -16,7 +16,6 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "private.h" -#include <ccan/hash/hash.h> #include <assert.h> /* all tdbs, to detect double-opens (fcntl file don't nest!) */ @@ -242,16 +241,6 @@ enum TDB_ERROR tdb_set_attribute(struct tdb_context *tdb, return TDB_SUCCESS; } -static uint64_t jenkins_hash(const void *key, size_t length, uint64_t seed, - void *unused) -{ - uint64_t ret; - /* hash64_stable assumes lower bits are more important; they are a - * slightly better hash. We use the upper bits first, so swap them. */ - ret = hash64_stable((const unsigned char *)key, length, seed); - return (ret >> 32) | (ret << 32); -} - enum TDB_ERROR tdb_get_attribute(struct tdb_context *tdb, union tdb_attribute *attr) { @@ -371,7 +360,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, tdb->openhook = NULL; tdb->lock_fn = tdb_fcntl_lock; tdb->unlock_fn = tdb_fcntl_unlock; - tdb->hash_fn = jenkins_hash; + tdb->hash_fn = tdb_jenkins_hash; memset(&tdb->stats, 0, sizeof(tdb->stats)); tdb->stats.base.attr = TDB_ATTRIBUTE_STATS; tdb->stats.size = sizeof(tdb->stats); |