sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3:dbwrap: fix db_rbt_traverse() to return the record count on success

Browse Source 
this makes it consistent with documented behaviour of tdb_traverse()

Signed-off-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Gregor Beck 2011-08-17 11:44:12 +02:00 committed by Michael Adam
parent ebcb921182
commit 7b9bf28514
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/lib/dbwrap/dbwrap_rbt.c
View File

@ -320,7 +320,7 @@ static int db_rbt_wipe(struct db_context *db)
{
struct db_rbt_ctx *old_ctx = talloc_get_type_abort(
db->private_data, struct db_rbt_ctx);
struct db_rbt_ctx *new_ctx = TALLOC_ZERO_P(db, struct db_rbt_ctx);
struct db_rbt_ctx *new_ctx = talloc_zero(db, struct db_rbt_ctx);
if (new_ctx == NULL) {
return -1;
}
@ -369,7 +369,7 @@ static int db_rbt_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
static int db_rbt_traverse_internal(struct rb_node *n,
int (*f)(struct db_record *db,
void *private_data),
void *private_data)
void *private_data, uint32_t* count)
{
struct db_rbt_node *r;
struct db_record rec;
@ -379,7 +379,7 @@ static int db_rbt_traverse_internal(struct rb_node *n,
return 0;
}
ret = db_rbt_traverse_internal(n->rb_left, f, private_data);
ret = db_rbt_traverse_internal(n->rb_left, f, private_data, count);
if (ret != 0) {
return ret;
}
@ -389,11 +389,12 @@ static int db_rbt_traverse_internal(struct rb_node *n,
db_rbt_parse_node(r, &rec.key, &rec.value);
ret = f(&rec, private_data);
(*count) ++;
if (ret != 0) {
return ret;
}
return db_rbt_traverse_internal(n->rb_right, f, private_data);
return db_rbt_traverse_internal(n->rb_right, f, private_data, count);
}
static int db_rbt_traverse(struct db_context *db,
@ -403,8 +404,16 @@ static int db_rbt_traverse(struct db_context *db,
{
struct db_rbt_ctx *ctx = talloc_get_type_abort(
db->private_data, struct db_rbt_ctx);
uint32_t count = 0;
return db_rbt_traverse_internal(ctx->tree.rb_node, f, private_data);
int ret = db_rbt_traverse_internal(ctx->tree.rb_node, f, private_data, &count);
if (ret != 0) {
return -1;
}
if (count > INT_MAX) {
return -1;
}
return count;
}
static int db_rbt_get_seqnum(struct db_context *db)