summaryrefslogtreecommitdiff
path: root/source3/lib/tdb/common/io.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-08-12 00:55:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:29:30 -0500
commit594bbfcdeedc306ce4634dd827df342e86ed8390 (patch)
tree212d5765b8d897f65ecb99f417159a43d379c2c5 /source3/lib/tdb/common/io.c
parent921fbb25eb4a6097a1e960abadc4dc4b11d32cf6 (diff)
downloadsamba-594bbfcdeedc306ce4634dd827df342e86ed8390.tar.gz
samba-594bbfcdeedc306ce4634dd827df342e86ed8390.tar.bz2
samba-594bbfcdeedc306ce4634dd827df342e86ed8390.zip
r24340: Use standard data type uint32_t rather than tdb-specific u32.
(This used to be commit 26d1430283bd4ae8b8a84f3253e33417d509c1a4)
Diffstat (limited to 'source3/lib/tdb/common/io.c')
-rw-r--r--source3/lib/tdb/common/io.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/tdb/common/io.c b/source3/lib/tdb/common/io.c
index b2b4ee0380..c8ea26c06c 100644
--- a/source3/lib/tdb/common/io.c
+++ b/source3/lib/tdb/common/io.c
@@ -99,9 +99,9 @@ static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
}
/* Endian conversion: we only ever deal with 4 byte quantities */
-void *tdb_convert(void *buf, u32 size)
+void *tdb_convert(void *buf, uint32_t size)
{
- u32 i, *p = (u32 *)buf;
+ uint32_t i, *p = (uint32_t *)buf;
for (i = 0; i < size / 4; i++)
p[i] = TDB_BYTEREV(p[i]);
return buf;
@@ -142,17 +142,17 @@ static int tdb_read(struct tdb_context *tdb, tdb_off_t off, void *buf,
do an unlocked scan of the hash table heads to find the next non-zero head. The value
will then be confirmed with the lock held
*/
-static void tdb_next_hash_chain(struct tdb_context *tdb, u32 *chain)
+static void tdb_next_hash_chain(struct tdb_context *tdb, uint32_t *chain)
{
- u32 h = *chain;
+ uint32_t h = *chain;
if (tdb->map_ptr) {
for (;h < tdb->header.hash_size;h++) {
- if (0 != *(u32 *)(TDB_HASH_TOP(h) + (unsigned char *)tdb->map_ptr)) {
+ if (0 != *(uint32_t *)(TDB_HASH_TOP(h) + (unsigned char *)tdb->map_ptr)) {
break;
}
}
} else {
- u32 off=0;
+ uint32_t off=0;
for (;h < tdb->header.hash_size;h++) {
if (tdb_ofs_read(tdb, TDB_HASH_TOP(h), &off) != 0 || off != 0) {
break;