diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/common/util.c | 3 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_index.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/ldbmodify.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source4/lib/ldb/common/util.c b/source4/lib/ldb/common/util.c index e1a7ada1c6..534d07c1df 100644 --- a/source4/lib/ldb/common/util.c +++ b/source4/lib/ldb/common/util.c @@ -73,14 +73,13 @@ int list_find(const void *needle, max_i = nmemb-1; while (min_i < max_i) { - size_t test_t; int r; test_i = (min_i + max_i) / 2; r = comp_fn(needle, *(void * const *)(base_p + (size * test_i))); if (r == 0) { /* scan back for first element */ - while (test_t > 0 && + while (test_i > 0 && comp_fn(needle, *(void * const *)(base_p + (size * (test_i-1)))) == 0) { test_i--; } diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c index 76e17cdfd5..987ee017b6 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_index.c +++ b/source4/lib/ldb/ldb_tdb/ldb_index.c @@ -452,7 +452,7 @@ static int ltdb_index_dn(struct ldb_context *ldb, const struct ldb_message *index_list, struct dn_list *list) { - int ret; + int ret = -1; switch (tree->operation) { case LDB_OP_SIMPLE: diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c index ac32f90c3b..bc29369a5c 100644 --- a/source4/lib/ldb/tools/ldbmodify.c +++ b/source4/lib/ldb/tools/ldbmodify.c @@ -52,7 +52,7 @@ static void usage(void) static int process_file(struct ldb_context *ldb, FILE *f) { struct ldb_ldif *ldif; - int ret, count = 0; + int ret = -1, count = 0; while ((ldif = ldif_read_file(f))) { switch (ldif->changetype) { |