r19137: that looks nicer:-)

metze
(This used to be commit db40552d9471f4a8ce2c5c724319a4eb242ed24a)

diff --git a/source3/lib/ldb/common/ldb_msg.c b/source3/lib/ldb/common/ldb_msg.c
index f6fbb04afb055090cea1cdf94163e4bfe90d4877..809d965745bb5f56e179952a7a6e6bdd98bc2ccd 100644 (file)
--- a/source3/lib/ldb/common/ldb_msg.c
+++ b/source3/lib/ldb/common/ldb_msg.c
@@ -797,7 +797,7 @@ int ldb_msg_check_string_attribute(const struct ldb_message *msg, const char *na
        if (el == NULL)
                return 0;
 
-       val.data = (uint8_t *)discard_const(value);
+       val.data = discard_const_p(uint8_t, value);
        val.length = strlen(value);
 
        if (ldb_msg_find_val(el, &val))

diff --git a/source3/lib/ldb/common/ldb_parse.c b/source3/lib/ldb/common/ldb_parse.c
index ec6ba420b4cbf005eb16aed85748187df2d4276e..26f88769e6936ed5b4dc04496df698f5d5960368 100644 (file)
--- a/source3/lib/ldb/common/ldb_parse.c
+++ b/source3/lib/ldb/common/ldb_parse.c
@@ -134,7 +134,7 @@ char *ldb_binary_encode(void *mem_ctx, struct ldb_val val)
 char *ldb_binary_encode_string(void *mem_ctx, const char *string)
 {
        struct ldb_val val;
-       val.data = (uint8_t *)discard_const(string);
+       val.data = discard_const_p(uint8_t, string);
        val.length = strlen(string);
        return ldb_binary_encode(mem_ctx, val);
 }