sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

lib ldb ldb_key_value: csbuild unused parm module

Browse Source 
Fixes csbuild error.

Error: COMPILER_WARNING:
lib/ldb/ldb_key_value/ldb_kv.c: scope_hint: In function ‘ldb_kv_key_dn’
lib/ldb/ldb_key_value/ldb_kv.c:109:49: warning: unused parameter
‘module’ [-Wunused-para
meter]

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Gary Lockyer 2019-06-07 14:29:44 +12:00 committed by Andreas Schneider
parent 357bac2072
commit 883c738571
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ldb/ldb_key_value/ldb_kv.c
View File

@ -106,8 +106,7 @@ bool ldb_kv_key_is_normal_record(struct ldb_val key)
note that the key for a record can depend on whether the
dn refers to a case sensitive index record or not
*/
struct ldb_val ldb_kv_key_dn(struct ldb_module *module,
TALLOC_CTX *mem_ctx,
struct ldb_val ldb_kv_key_dn(TALLOC_CTX *mem_ctx,
struct ldb_dn *dn)
{
struct ldb_val key;
@ -198,7 +197,7 @@ int ldb_kv_idx_to_key(struct ldb_module *module,
return LDB_ERR_OPERATIONS_ERROR;
}
/* form the key */
*key = ldb_kv_key_dn(module, mem_ctx, dn);
*key = ldb_kv_key_dn(mem_ctx, dn);
TALLOC_FREE(dn);
if (!key->data) {
return ldb_module_oom(module);
@ -226,11 +225,11 @@ struct ldb_val ldb_kv_key_msg(struct ldb_module *module,
int ret;
if (ldb_kv->cache->GUID_index_attribute == NULL) {
return ldb_kv_key_dn(module, mem_ctx, msg->dn);
return ldb_kv_key_dn(mem_ctx, msg->dn);
}
if (ldb_dn_is_special(msg->dn)) {
return ldb_kv_key_dn(module, mem_ctx, msg->dn);
return ldb_kv_key_dn(mem_ctx, msg->dn);
}
guid_val =
@ -1312,13 +1311,13 @@ static int ldb_kv_rename(struct ldb_kv_context *ctx)
* Even in GUID index mode we use ltdb_key_dn() as we are
* trying to figure out if this is just a case rename
*/
key = ldb_kv_key_dn(module, msg, req->op.rename.newdn);
key = ldb_kv_key_dn(msg, req->op.rename.newdn);
if (!key.data) {
talloc_free(msg);
return LDB_ERR_OPERATIONS_ERROR;
}
key_old = ldb_kv_key_dn(module, msg, req->op.rename.olddn);
key_old = ldb_kv_key_dn(msg, req->op.rename.olddn);
if (!key_old.data) {
talloc_free(msg);
talloc_free(key.data);

3
lib/ldb/ldb_key_value/ldb_kv.h
View File

@ -276,8 +276,7 @@ int ldb_kv_search(struct ldb_kv_context *ctx);
* DN=@.
*/
bool ldb_kv_key_is_normal_record(struct ldb_val key);
struct ldb_val ldb_kv_key_dn(struct ldb_module *module,
TALLOC_CTX *mem_ctx,
struct ldb_val ldb_kv_key_dn(TALLOC_CTX *mem_ctx,
struct ldb_dn *dn);
struct ldb_val ldb_kv_key_msg(struct ldb_module *module,
TALLOC_CTX *mem_ctx,

2
lib/ldb/ldb_key_value/ldb_kv_cache.c
View File

@ -444,7 +444,7 @@ int ldb_kv_cache_load(struct ldb_module *module)
goto failed;
}
key = ldb_kv_key_dn(module, baseinfo, baseinfo_dn);
key = ldb_kv_key_dn(baseinfo, baseinfo_dn);
if (!key.data) {
goto failed_and_unlock;
}

4
lib/ldb/ldb_key_value/ldb_kv_index.c
View File

@ -1850,7 +1850,7 @@ static int ldb_kv_index_dn_ordered(struct ldb_module *module,
ldb_dn_get_linearized(key_dn));
return LDB_ERR_OPERATIONS_ERROR;
}
ldb_key = ldb_kv_key_dn(module, tmp_ctx, key_dn);
ldb_key = ldb_kv_key_dn(tmp_ctx, key_dn);
talloc_free(key_dn);
if (ldb_key.data == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
@ -1868,7 +1868,7 @@ static int ldb_kv_index_dn_ordered(struct ldb_module *module,
return LDB_ERR_OPERATIONS_ERROR;
}
ldb_key2 = ldb_kv_key_dn(module, tmp_ctx, key_dn);
ldb_key2 = ldb_kv_key_dn(tmp_ctx, key_dn);
talloc_free(key_dn);
if (ldb_key2.data == NULL) {
return LDB_ERR_OPERATIONS_ERROR;

2
lib/ldb/ldb_key_value/ldb_kv_search.c
View File

@ -250,7 +250,7 @@ int ldb_kv_search_dn1(struct ldb_module *module,
}
/* form the key */
key = ldb_kv_key_dn(module, tdb_key_ctx, dn);
key = ldb_kv_key_dn(tdb_key_ctx, dn);
if (!key.data) {
TALLOC_FREE(tdb_key_ctx);
return LDB_ERR_OPERATIONS_ERROR;