From e62abe623a407e0c355e8f95f22423b789609db9 Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Sat, 1 Dec 2018 09:57:53 +0100 Subject: [PATCH] fix warnings on qos function names and constness Signed-off-by: Erik Boasson --- src/core/ddsc/tests/qos.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/core/ddsc/tests/qos.c b/src/core/ddsc/tests/qos.c index fdd71cf..6219a08 100644 --- a/src/core/ddsc/tests/qos.c +++ b/src/core/ddsc/tests/qos.c @@ -243,39 +243,39 @@ Test(ddsc_qos, copy_bad_source, .init=qos_init, .fini=qos_fini) { dds_return_t result; - result = dds_qos_copy(g_qos, NULL); - cr_assert_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "returned %d", dds_err_nr(result)); + result = dds_copy_qos(g_qos, NULL); + cr_assert_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "returned %d", dds_err_nr(result)); } Test(ddsc_qos, copy_bad_destination, .init=qos_init, .fini=qos_fini) { - dds_return_t result; + dds_return_t result; - result = dds_qos_copy(NULL, g_qos); - cr_assert_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "returned %d", dds_err_nr(result)); + result = dds_copy_qos(NULL, g_qos); + cr_assert_eq(dds_err_nr(result), DDS_RETCODE_BAD_PARAMETER, "returned %d", dds_err_nr(result)); } Test(ddsc_qos, copy_with_partition, .init=qos_init, .fini=qos_fini) { - dds_return_t result; - dds_qos_t *qos; - struct pol_partition p = { 0, NULL }; + dds_return_t result; + dds_qos_t *qos; + struct pol_partition p = { 0, NULL }; - qos = dds_qos_create(); - cr_assert_not_null(qos); + qos = dds_create_qos(); + cr_assert_not_null(qos); - dds_qset_partition(g_qos, g_pol_partition.n, g_pol_partition.ps); - result = dds_qos_copy(qos, g_qos); + dds_qset_partition(g_qos, g_pol_partition.n, (const char **)g_pol_partition.ps); + result = dds_copy_qos(qos, g_qos); - cr_assert_eq(result, DDS_RETCODE_OK); - dds_qget_partition(qos, &p.n, &p.ps); - cr_assert_eq(p.n, g_pol_partition.n); + cr_assert_eq(result, DDS_RETCODE_OK); + dds_qget_partition(qos, &p.n, &p.ps); + cr_assert_eq(p.n, g_pol_partition.n); - for (uint32_t cnt = 0; cnt < p.n; cnt++) { - cr_assert_str_eq(p.ps[cnt], g_pol_partition.ps[cnt]); - } + for (uint32_t cnt = 0; cnt < p.n; cnt++) { + cr_assert_str_eq(p.ps[cnt], g_pol_partition.ps[cnt]); + } - dds_qos_delete(qos); + dds_delete_qos(qos); } Test(ddsc_qos, userdata, .init=qos_init, .fini=qos_fini)