The branch, master has been updated
via 795bab56291 lib:ldb: Correctly cast pointers for
assert_string_equal()
from b4a6c054ec6 selftest: Use setUpClass() to reduce "make test
TESTS=large_ldap" time
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 795bab5629195395d512bb9a830542de6067195b
Author: Andreas Schneider <a...@samba.org>
Date: Tue Mar 14 09:48:37 2023 +0100
lib:ldb: Correctly cast pointers for assert_string_equal()
This is a change in cmocka to avoid hiding possible errors.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Wed Mar 15 07:53:54 UTC 2023 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/tests/ldb_filter_attrs_test.c | 10 +++++-----
lib/ldb/tests/ldb_mod_op_test.c | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/tests/ldb_filter_attrs_test.c
b/lib/ldb/tests/ldb_filter_attrs_test.c
index 7d555e0da2e..9e985e13c63 100644
--- a/lib/ldb/tests/ldb_filter_attrs_test.c
+++ b/lib/ldb/tests/ldb_filter_attrs_test.c
@@ -660,7 +660,7 @@ static void test_filter_attrs_one_attr_matched_star(void
**state)
assert_string_equal(ldb_msg_find_attr_as_string(filtered_msg,
"foo",
NULL),
- value);
+ (const char *)value);
}
/*
@@ -729,11 +729,11 @@ static void test_filter_attrs_two_attr_matched_star(void
**state)
assert_string_equal(ldb_msg_find_attr_as_string(filtered_msg,
"foo",
NULL),
- value1);
+ (const char *)value1);
assert_string_equal(ldb_msg_find_attr_as_string(filtered_msg,
"bar",
NULL),
- value2);
+ (const char *)value2);
}
/*
@@ -828,7 +828,7 @@ static void test_filter_attrs_one_attr_matched_star_dn(void
**state)
assert_string_equal(ldb_msg_find_attr_as_string(filtered_msg,
"foo",
NULL),
- value);
+ (const char *)value);
}
/*
@@ -877,7 +877,7 @@ static void test_filter_attrs_one_attr_matched_dn(void
**state)
assert_ptr_equal(filtered_msg->dn, in.dn);
assert_string_equal(filtered_msg->elements[0].name,
"distinguishedName");
assert_int_equal(filtered_msg->elements[0].num_values, 1);
- assert_string_equal(filtered_msg->elements[0].values[0].data,
+ assert_string_equal((const char
*)filtered_msg->elements[0].values[0].data,
ldb_dn_get_linearized(in.dn));
}
diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
index cf40fe42b73..eca59068c9f 100644
--- a/lib/ldb/tests/ldb_mod_op_test.c
+++ b/lib/ldb/tests/ldb_mod_op_test.c
@@ -152,7 +152,7 @@ static void test_ldif_message(void **state)
"supersecret: password\n"
"binary:: //8=\n"
"\n";
-
+
struct ldb_message *msg = get_test_ldb_message(test_ctx,
test_ctx->ldb);
@@ -182,13 +182,13 @@ static void test_ldif_message_redacted(void **state)
"supersecret",
NULL
};
-
+
struct ldb_message *msg = ldb_msg_new(test_ctx);
ldb_set_opaque(test_ctx->ldb,
LDB_SECRET_ATTRIBUTE_LIST_OPAQUE,
secret_attrs);
-
+
assert_non_null(msg);
msg->dn = ldb_dn_new(msg, test_ctx->ldb, "dc=samba,dc=org");
@@ -924,12 +924,12 @@ static void test_ldb_modify_add_key(void **state)
el = ldb_msg_find_element(res->msgs[0], "cn");
assert_non_null(el);
assert_int_equal(el->num_values, 1);
- assert_string_equal(el->values[0].data, "test_mod_cn");
+ assert_string_equal((const char *)el->values[0].data, "test_mod_cn");
el = ldb_msg_find_element(res->msgs[0], "name");
assert_non_null(el);
assert_int_equal(el->num_values, 1);
- assert_string_equal(el->values[0].data, "test_mod_name");
+ assert_string_equal((const char *)el->values[0].data, "test_mod_name");
}
static void test_ldb_modify_extend_key(void **state)
@@ -952,8 +952,8 @@ static void test_ldb_modify_extend_key(void **state)
el = ldb_msg_find_element(res->msgs[0], "cn");
assert_non_null(el);
assert_int_equal(el->num_values, 2);
- assert_string_equal(el->values[0].data, "test_mod_cn");
- assert_string_equal(el->values[1].data, "test_mod_cn2");
+ assert_string_equal((const char *)el->values[0].data, "test_mod_cn");
+ assert_string_equal((const char *)el->values[1].data, "test_mod_cn2");
}
static void test_ldb_modify_add_key_noval(void **state)
@@ -1009,7 +1009,7 @@ static void test_ldb_modify_replace_key(void **state)
el = ldb_msg_find_element(res->msgs[0], "cn");
assert_non_null(el);
assert_int_equal(el->num_values, 1);
- assert_string_equal(el->values[0].data, new_cn);
+ assert_string_equal((const char *)el->values[0].data, new_cn);
}
static void test_ldb_modify_replace_noexist_key(void **state)
@@ -1032,12 +1032,12 @@ static void test_ldb_modify_replace_noexist_key(void
**state)
el = ldb_msg_find_element(res->msgs[0], "cn");
assert_non_null(el);
assert_int_equal(el->num_values, 1);
- assert_string_equal(el->values[0].data, "test_mod_cn");
+ assert_string_equal((const char *)el->values[0].data, "test_mod_cn");
el = ldb_msg_find_element(res->msgs[0], mod_kvs[0].key);
assert_non_null(el);
assert_int_equal(el->num_values, 1);
- assert_string_equal(el->values[0].data, mod_kvs[0].val);
+ assert_string_equal((const char *)el->values[0].data, mod_kvs[0].val);
}
static void test_ldb_modify_replace_zero_vals(void **state)
@@ -1232,7 +1232,7 @@ static void assert_attr_has_vals(struct ldb_message *msg,
assert_int_equal(el->num_values, nvals);
for (i = 0; i < nvals; i++) {
- assert_string_equal(el->values[i].data,
+ assert_string_equal((const char *)el->values[i].data,
vals[i]);
}
}
--
Samba Shared Repository
