diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-07-26 21:16:46 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-07-28 10:06:12 +0200 |
| commit | 5f815c8aa9dbf9e442255da2501d76207a705598 (patch) | |
| tree | 56a15190d75beca605ea7e95bd351769ea396e82 /lib/ldb | |
| parent | e517d68a8f2772b863a7c072bd95d224b4ab8bf4 (diff) | |
| download | samba-5f815c8aa9dbf9e442255da2501d76207a705598.tar.gz | |
ldb: fix compiler warnings on ldb_unpack_data() arguments
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'lib/ldb')
| -rw-r--r-- | lib/ldb/ldb_tdb/ldb_index.c | 6 | ||||
| -rw-r--r-- | lib/ldb/ldb_tdb/ldb_search.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c index 800363a0a3d..d29662305b2 100644 --- a/lib/ldb/ldb_tdb/ldb_index.c +++ b/lib/ldb/ldb_tdb/ldb_index.c @@ -1534,6 +1534,10 @@ static int re_index(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void * struct ltdb_reindex_context *ctx = (struct ltdb_reindex_context *)state; struct ldb_module *module = ctx->module; struct ldb_message *msg; + const struct ldb_val val = { + .data = data.dptr, + .length = data.dsize, + }; const char *dn = NULL; int ret; TDB_DATA key2; @@ -1550,7 +1554,7 @@ static int re_index(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, void * return -1; } - ret = ldb_unpack_data(ldb, (struct ldb_val *)&data, msg); + ret = ldb_unpack_data(ldb, &val, msg); if (ret != 0) { ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid data for index %s\n", ldb_dn_get_linearized(msg->dn)); diff --git a/lib/ldb/ldb_tdb/ldb_search.c b/lib/ldb/ldb_tdb/ldb_search.c index 979e7c83f97..133e5d43f62 100644 --- a/lib/ldb/ldb_tdb/ldb_search.c +++ b/lib/ldb/ldb_tdb/ldb_search.c @@ -470,6 +470,10 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi struct ldb_context *ldb; struct ltdb_context *ac; struct ldb_message *msg; + const struct ldb_val val = { + .data = data.dptr, + .length = data.dsize, + }; int ret; bool matched; @@ -488,7 +492,7 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi } /* unpack the record */ - ret = ldb_unpack_data(ldb, (struct ldb_val *)&data, msg); + ret = ldb_unpack_data(ldb, &val, msg); if (ret == -1) { talloc_free(msg); ac->error = LDB_ERR_OPERATIONS_ERROR; |