From 6892edd66e0a1f2f8633c59b8cf8d0fa91e82394 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 17 Mar 2011 22:12:21 +1030 Subject: [PATCH] tdb2: rename tdb_lock_type to tdb_lock Internal reshuffle which makes things shorter and neater. --- ccan/tdb2/lock.c | 9 ++++----- ccan/tdb2/private.h | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ccan/tdb2/lock.c b/ccan/tdb2/lock.c index 19da88e2..8e73c253 100644 --- a/ccan/tdb2/lock.c +++ b/ccan/tdb2/lock.c @@ -236,8 +236,7 @@ enum TDB_ERROR tdb_allrecord_upgrade(struct tdb_context *tdb) "tdb_allrecord_upgrade failed"); } -static struct tdb_lock_type *find_nestlock(struct tdb_context *tdb, - tdb_off_t offset) +static struct tdb_lock *find_nestlock(struct tdb_context *tdb, tdb_off_t offset) { unsigned int i; @@ -276,7 +275,7 @@ static enum TDB_ERROR tdb_nest_lock(struct tdb_context *tdb, tdb_off_t offset, int ltype, enum tdb_lock_flags flags) { - struct tdb_lock_type *new_lck; + struct tdb_lock *new_lck; enum TDB_ERROR ecode; if (offset > (TDB_HASH_LOCK_START + TDB_HASH_LOCK_RANGE @@ -311,7 +310,7 @@ static enum TDB_ERROR tdb_nest_lock(struct tdb_context *tdb, "tdb_nest_lock: already have a hash lock?"); } - new_lck = (struct tdb_lock_type *)realloc( + new_lck = (struct tdb_lock *)realloc( tdb->file->lockrecs, sizeof(*tdb->file->lockrecs) * (tdb->file->num_lockrecs+1)); if (new_lck == NULL) { @@ -360,7 +359,7 @@ static enum TDB_ERROR tdb_nest_lock(struct tdb_context *tdb, static enum TDB_ERROR tdb_nest_unlock(struct tdb_context *tdb, tdb_off_t off, int ltype) { - struct tdb_lock_type *lck; + struct tdb_lock *lck; enum TDB_ERROR ecode; if (tdb->flags & TDB_NOLOCK) diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h index 762cdd12..d1f12b55 100644 --- a/ccan/tdb2/private.h +++ b/ccan/tdb2/private.h @@ -300,7 +300,7 @@ enum tdb_lock_flags { TDB_LOCK_NOCHECK = 4, }; -struct tdb_lock_type { +struct tdb_lock { uint32_t off; uint32_t count; uint32_t ltype; @@ -329,9 +329,9 @@ struct tdb_file { int fd; /* Lock information */ - struct tdb_lock_type allrecord_lock; + struct tdb_lock allrecord_lock; size_t num_lockrecs; - struct tdb_lock_type *lockrecs; + struct tdb_lock *lockrecs; /* Identity of this file. */ dev_t device; -- 2.39.2