The Samba-Bugzilla – Attachment 3540 Details for
Bug 5739
Cosmetic corrections
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
LDB backends cosmetic patch
ldbBackCosmetic.patch (text/plain), 16.27 KB, created by
Matthias Dieter Wallnöfer
on 2008-09-07 16:02:10 UTC
(
hide
)
Description:
LDB backends cosmetic patch
Filename:
MIME Type:
Creator:
Matthias Dieter Wallnöfer
Created:
2008-09-07 16:02:10 UTC
Size:
16.27 KB
patch
obsolete
>diff --git a/source/lib/ldb/ldb_ildap/ldb_ildap.c b/source/lib/ldb/ldb_ildap/ldb_ildap.c >index 5ad671e..3a5da89 100644 >--- a/source/lib/ldb/ldb_ildap/ldb_ildap.c >+++ b/source/lib/ldb/ldb_ildap/ldb_ildap.c >@@ -753,7 +753,7 @@ static int ildb_connect(struct ldb_context *ldb, const char *url, > module = talloc(ldb, struct ldb_module); > if (!module) { > ldb_oom(ldb); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > talloc_set_name_const(module, "ldb_ildap backend"); > module->ldb = ldb; >@@ -819,11 +819,11 @@ static int ildb_connect(struct ldb_context *ldb, const char *url, > } > > *_module = module; >- return 0; >+ return LDB_SUCCESS; > > failed: > talloc_free(module); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > _PUBLIC_ const struct ldb_backend_ops ldb_ldap_backend_ops = { >diff --git a/source/lib/ldb/ldb_ldap/ldb_ldap.c b/source/lib/ldb/ldb_ldap/ldb_ldap.c >index a4534c5..5026f9c 100644 >--- a/source/lib/ldb/ldb_ldap/ldb_ldap.c >+++ b/source/lib/ldb/ldb_ldap/ldb_ldap.c >@@ -180,14 +180,14 @@ static int lldb_add_msg_attr(struct ldb_context *ldb, > count = ldap_count_values_len(bval); > > if (count <= 0) { >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > el = talloc_realloc(msg, msg->elements, struct ldb_message_element, > msg->num_elements + 1); > if (!el) { > errno = ENOMEM; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > msg->elements = el; >@@ -197,7 +197,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb, > el->name = talloc_strdup(msg->elements, attr); > if (!el->name) { > errno = ENOMEM; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > el->flags = 0; > >@@ -205,7 +205,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb, > el->values = talloc_array(msg->elements, struct ldb_val, count); > if (!el->values) { > errno = ENOMEM; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > for (i=0;i<count;i++) { >@@ -214,7 +214,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb, > el->values[i].data = talloc_size(el->values, bval[i]->bv_len+1); > if (!el->values[i].data) { > errno = ENOMEM; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > memcpy(el->values[i].data, bval[i]->bv_val, bval[i]->bv_len); > el->values[i].data[bval[i]->bv_len] = 0; >@@ -224,7 +224,7 @@ static int lldb_add_msg_attr(struct ldb_context *ldb, > > msg->num_elements++; > >- return 0; >+ return LDB_SUCCESS; > } > > /* >@@ -785,7 +785,7 @@ static int lldb_connect(struct ldb_context *ldb, > if (module == NULL) { > ldb_oom(ldb); > talloc_free(lldb); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > talloc_set_name_const(module, "ldb_ldap backend"); > module->ldb = ldb; >@@ -819,11 +819,11 @@ static int lldb_connect(struct ldb_context *ldb, > } > > *_module = module; >- return 0; >+ return LDB_SUCCESS; > > failed: > talloc_free(module); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > const struct ldb_backend_ops ldb_ldap_backend_ops = { >diff --git a/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c >index a0e63c8..7e4fe1d 100644 >--- a/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c >+++ b/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c >@@ -670,10 +670,10 @@ static int lsqlite3_safe_rollback(sqlite3 *sqlite) > printf("lsqlite3_safe_rollback: Error: %s\n", errmsg); > free(errmsg); > } >- return -1; >+ return SQLITE_ERROR; > } > >- return 0; >+ return SQLITE_OK; > } > > /* return an eid as result */ >@@ -1440,13 +1440,13 @@ static int lsql_start_trans(struct ldb_module * module) > printf("lsqlite3_start_trans: error: %s\n", errmsg); > free(errmsg); > } >- return -1; >+ return SQLITE_ERROR; > } > }; > > lsqlite3->trans_count++; > >- return 0; >+ return SQLITE_OK; > } > > static int lsql_end_trans(struct ldb_module *module) >@@ -1457,7 +1457,7 @@ static int lsql_end_trans(struct ldb_module *module) > > if (lsqlite3->trans_count > 0) { > lsqlite3->trans_count--; >- } else return -1; >+ } else return SQLITE_ERROR; > > if (lsqlite3->trans_count == 0) { > ret = sqlite3_exec(lsqlite3->sqlite, "COMMIT;", NULL, NULL, &errmsg); >@@ -1466,11 +1466,11 @@ static int lsql_end_trans(struct ldb_module *module) > printf("lsqlite3_end_trans: error: %s\n", errmsg); > free(errmsg); > } >- return -1; >+ return SQLITE_ERROR; > } > } > >- return 0; >+ return SQLITE_OK; > } > > static int lsql_del_trans(struct ldb_module *module) >@@ -1479,13 +1479,13 @@ static int lsql_del_trans(struct ldb_module *module) > > if (lsqlite3->trans_count > 0) { > lsqlite3->trans_count--; >- } else return -1; >+ } else return SQLITE_ERROR; > > if (lsqlite3->trans_count == 0) { > return lsqlite3_safe_rollback(lsqlite3->sqlite); > } > >- return -1; >+ return SQLITE_ERROR; > } > > static int destructor(struct lsqlite3_private *lsqlite3) >@@ -1493,7 +1493,7 @@ static int destructor(struct lsqlite3_private *lsqlite3) > if (lsqlite3->sqlite) { > sqlite3_close(lsqlite3->sqlite); > } >- return 0; >+ return SQLITE_OK; > } > > static int lsql_request(struct ldb_module *module, struct ldb_request *req) >@@ -1540,7 +1540,7 @@ static int initialize(struct lsqlite3_private *lsqlite3, > /* create a local ctx */ > local_ctx = talloc_named(lsqlite3, 0, "lsqlite3_rename local context"); > if (local_ctx == NULL) { >- return -1; >+ return SQLITE_ERROR; > } > > schema = lsqlite3_tprintf(local_ctx, >@@ -1792,7 +1792,7 @@ static int initialize(struct lsqlite3_private *lsqlite3, > failed: > if (rollback) lsqlite3_safe_rollback(lsqlite3->sqlite); > sqlite3_close(lsqlite3->sqlite); >- return -1; >+ return SQLITE_ERROR; > } > > /* >@@ -1860,14 +1860,14 @@ static int lsqlite3_connect(struct ldb_context *ldb, > } > } > >- return 0; >+ return LDB_SUCCESS; > > failed: > if (lsqlite3->sqlite != NULL) { > (void) sqlite3_close(lsqlite3->sqlite); > } > talloc_free(lsqlite3); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > const struct ldb_backend_ops ldb_sqlite3_backend_ops = { >diff --git a/source/lib/ldb/ldb_tdb/ldb_cache.c b/source/lib/ldb/ldb_tdb/ldb_cache.c >index 2576e2c..e502f1e 100644 >--- a/source/lib/ldb/ldb_tdb/ldb_cache.c >+++ b/source/lib/ldb/ldb_tdb/ldb_cache.c >@@ -92,11 +92,11 @@ static int ltdb_attributes_flags(struct ldb_message_element *el, unsigned *v) > } > } > if (ltdb_valid_attr_flags[j].name == NULL) { >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > } > *v = value; >- return 0; >+ return LDB_SUCCESS; > } > > /* >@@ -118,7 +118,7 @@ static int ltdb_attributes_load(struct ldb_module *module) > goto failed; > } > if (r == LDB_ERR_NO_SUCH_OBJECT) { >- return 0; >+ return LDB_SUCCESS; > } > /* mapping these flags onto ldap 'syntaxes' isn't strictly correct, > but its close enough for now */ >@@ -162,9 +162,9 @@ static int ltdb_attributes_load(struct ldb_module *module) > } > } > >- return 0; >+ return LDB_SUCCESS; > failed: >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > >@@ -258,7 +258,7 @@ int ltdb_cache_load(struct ldb_module *module) > /* a very fast check to avoid extra database reads */ > if (ltdb->cache != NULL && > tdb_get_seqnum(ltdb->tdb) == ltdb->tdb_seqnum) { >- return 0; >+ return LDB_SUCCESS; > } > > if (ltdb->cache == NULL) { >@@ -344,7 +344,7 @@ int ltdb_cache_load(struct ldb_module *module) > goto failed; > } > >- if (ltdb_attributes_load(module) == -1) { >+ if (ltdb_attributes_load(module) != LDB_SUCCESS) { > goto failed; > } > >@@ -353,14 +353,14 @@ done: > talloc_free(baseinfo); > talloc_free(baseinfo_dn); > talloc_free(indexlist_dn); >- return 0; >+ return LDB_SUCCESS; > > failed: > talloc_free(options); > talloc_free(baseinfo); > talloc_free(baseinfo_dn); > talloc_free(indexlist_dn); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > >@@ -449,10 +449,10 @@ int ltdb_check_at_attributes_values(const struct ldb_val *value) > > for (i = 0; ltdb_valid_attr_flags[i].name != NULL; i++) { > if ((strcmp(ltdb_valid_attr_flags[i].name, (char *)value->data) == 0)) { >- return 0; >+ return LDB_SUCCESS; > } > } > >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > >diff --git a/source/lib/ldb/ldb_tdb/ldb_pack.c b/source/lib/ldb/ldb_tdb/ldb_pack.c >index afb07dc..d96e759 100644 >--- a/source/lib/ldb/ldb_tdb/ldb_pack.c >+++ b/source/lib/ldb/ldb_tdb/ldb_pack.c >@@ -89,7 +89,7 @@ int ltdb_pack_data(struct ldb_module *module, > dn = ldb_dn_get_linearized(message->dn); > if (dn == NULL) { > errno = ENOMEM; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > /* work out how big it needs to be */ >@@ -114,7 +114,7 @@ int ltdb_pack_data(struct ldb_module *module, > data->dptr = talloc_array(ldb, uint8_t, size); > if (!data->dptr) { > errno = ENOMEM; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > data->dsize = size; > >@@ -147,7 +147,7 @@ int ltdb_pack_data(struct ldb_module *module, > } > } > >- return 0; >+ return LDB_SUCCESS; > } > > /* >@@ -207,7 +207,7 @@ int ltdb_unpack_data(struct ldb_module *module, > > if (message->num_elements == 0) { > message->elements = NULL; >- return 0; >+ return LDB_SUCCESS; > } > > if (message->num_elements > remaining / 6) { >@@ -281,9 +281,9 @@ int ltdb_unpack_data(struct ldb_module *module, > "Error: %d bytes unread in ltdb_unpack_data\n", remaining); > } > >- return 0; >+ return LDB_SUCCESS; > > failed: > talloc_free(message->elements); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } >diff --git a/source/lib/ldb/ldb_tdb/ldb_search.c b/source/lib/ldb/ldb_tdb/ldb_search.c >index da899c3..ce7a90e 100644 >--- a/source/lib/ldb/ldb_tdb/ldb_search.c >+++ b/source/lib/ldb/ldb_tdb/ldb_search.c >@@ -262,7 +262,7 @@ int ltdb_search_dn1(struct ldb_module *module, struct ldb_dn *dn, struct ldb_mes > > ret = ltdb_unpack_data(module, &tdb_data, msg); > free(tdb_data.dptr); >- if (ret == -1) { >+ if (ret != LDB_SUCCESS) { > return LDB_ERR_OPERATIONS_ERROR; > } > >@@ -285,7 +285,7 @@ static int ltdb_lock_read(struct ldb_module *module) > if (ltdb->in_transaction == 0) { > return tdb_lockall_read(ltdb->tdb); > } >- return 0; >+ return LDB_SUCCESS; > } > > /* >@@ -297,7 +297,7 @@ static int ltdb_unlock_read(struct ldb_module *module) > if (ltdb->in_transaction == 0) { > return tdb_unlockall_read(ltdb->tdb); > } >- return 0; >+ return LDB_SUCCESS; > } > > /* >@@ -317,14 +317,14 @@ int ltdb_add_attr_results(struct ldb_module *module, > /* pull the attributes that the user wants */ > msg2 = ltdb_pull_attrs(module, mem_ctx, msg, attrs); > if (!msg2) { >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > /* add to the results list */ > res2 = talloc_realloc(mem_ctx, *res, struct ldb_message *, (*count)+2); > if (!res2) { > talloc_free(msg2); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > (*res) = res2; >@@ -333,7 +333,7 @@ int ltdb_add_attr_results(struct ldb_module *module, > (*res)[(*count)+1] = NULL; > (*count)++; > >- return 0; >+ return LDB_SUCCESS; > } > > >@@ -356,7 +356,7 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs) > > if (ldb_attr_cmp(attrs[i], "distinguishedName") == 0) { > if (msg_add_distinguished_name(msg) != 0) { >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > } > } >@@ -366,9 +366,9 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs) > > if (keep_all) { > if (msg_add_distinguished_name(msg) != 0) { >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } >- return 0; >+ return LDB_SUCCESS; > } > > for (i = 0; i < msg->num_elements; i++) { >@@ -387,7 +387,7 @@ int ltdb_filter_attrs(struct ldb_message *msg, const char * const *attrs) > } > } > >- return 0; >+ return LDB_SUCCESS; > } > > /* >@@ -402,14 +402,14 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi > > if (key.dsize < 4 || > strncmp((char *)key.dptr, "DN=", 3) != 0) { >- return 0; >+ return LDB_SUCCESS; > } > > ares = talloc_zero(ac, struct ldb_reply); > if (!ares) { > handle->status = LDB_ERR_OPERATIONS_ERROR; > handle->state = LDB_ASYNC_DONE; >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > ares->message = ldb_msg_new(ares); >@@ -417,14 +417,14 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi > handle->status = LDB_ERR_OPERATIONS_ERROR; > handle->state = LDB_ASYNC_DONE; > talloc_free(ares); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > /* unpack the record */ > ret = ltdb_unpack_data(ac->module, &data, ares->message); >- if (ret == -1) { >+ if (ret) { > talloc_free(ares); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > if (!ares->message->dn) { >@@ -433,7 +433,7 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi > handle->status = LDB_ERR_OPERATIONS_ERROR; > handle->state = LDB_ASYNC_DONE; > talloc_free(ares); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > } > >@@ -441,17 +441,17 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi > if (!ldb_match_msg(ac->module->ldb, ares->message, ac->tree, > ac->base, ac->scope)) { > talloc_free(ares); >- return 0; >+ return LDB_SUCCESS; > } > > /* filter the attributes that the user wants */ > ret = ltdb_filter_attrs(ares->message, ac->attrs); > >- if (ret == -1) { >+ if (ret != LDB_SUCCESS) { > handle->status = LDB_ERR_OPERATIONS_ERROR; > handle->state = LDB_ASYNC_DONE; > talloc_free(ares); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > ares->type = LDB_REPLY_ENTRY; >@@ -460,10 +460,10 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi > > if (handle->status != LDB_SUCCESS) { > /* don't try to free ares here, the callback is in charge of that */ >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > >- return 0; >+ return LDB_SUCCESS; > } > > >diff --git a/source/lib/ldb/ldb_tdb/ldb_tdb.c b/source/lib/ldb/ldb_tdb/ldb_tdb.c >index 01d570c..b711efd 100644 >--- a/source/lib/ldb/ldb_tdb/ldb_tdb.c >+++ b/source/lib/ldb/ldb_tdb/ldb_tdb.c >@@ -174,7 +174,7 @@ int ltdb_check_special_dn(struct ldb_module *module, > > if (! ldb_dn_is_special(msg->dn) || > ! ldb_dn_check_special(msg->dn, LTDB_ATTRIBUTES)) { >- return 0; >+ return LDB_SUCCESS; > } > > /* we have @ATTRIBUTES, let's check attributes are fine */ >@@ -188,7 +188,7 @@ int ltdb_check_special_dn(struct ldb_module *module, > } > } > >- return 0; >+ return LDB_SUCCESS; > } > > >@@ -231,7 +231,7 @@ int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flg > } > > ret = ltdb_pack_data(module, msg, &tdb_data); >- if (ret == -1) { >+ if (ret != LDB_SUCCESS) { > talloc_free(tdb_key.dptr); > return LDB_ERR_OTHER; > } >@@ -626,7 +626,7 @@ int ltdb_modify_internal(struct ldb_module *module, > } > > ret = ltdb_unpack_data(module, &tdb_data, msg2); >- if (ret == -1) { >+ if (ret != LDB_SUCCESS) { > ret = LDB_ERR_OTHER; > goto failed; > } >@@ -1069,7 +1069,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, > if (strncmp(url, "tdb://", 6) != 0) { > ldb_debug(ldb, LDB_DEBUG_ERROR, > "Invalid tdb URL '%s'", url); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > path = url+6; > } else { >@@ -1097,7 +1097,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, > ltdb = talloc_zero(ldb, struct ltdb_private); > if (!ltdb) { > ldb_oom(ldb); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > /* note that we use quite a large default hash size */ >@@ -1108,7 +1108,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, > ldb_debug(ldb, LDB_DEBUG_ERROR, > "Unable to open tdb '%s'\n", path); > talloc_free(ltdb); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > > ltdb->sequence_number = 0; >@@ -1117,7 +1117,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, > if (!module) { > ldb_oom(ldb); > talloc_free(ltdb); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > talloc_set_name_const(*module, "ldb_tdb backend"); > (*module)->ldb = ldb; >@@ -1128,10 +1128,10 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, > if (ltdb_cache_load(*module) != 0) { > talloc_free(*module); > talloc_free(ltdb); >- return -1; >+ return LDB_ERR_OPERATIONS_ERROR; > } > >- return 0; >+ return LDB_SUCCESS; > } > > const struct ldb_backend_ops ldb_tdb_backend_ops = { >diff --git a/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c b/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c >index 654574c..59a1590 100644 >--- a/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c >+++ b/source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c >@@ -53,7 +53,7 @@ static int ltdb_wrap_destructor(struct ltdb_wrap *w) > if (w == tdb_list) { > tdb_list = w->next; > } >- return 0; >+ return LDB_SUCCESS; > } > > static void ltdb_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 5739
:
3534
|
3535
|
3536
|
3537
|
3538
|
3539
|
3540
|
3541
|
3628