niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bring listener operations naming scheme in line with the rest

Browse source 
The main naming scheme is OPER_TYPE (i.e., dds_create_participant) but the listener operations were named TYPE_OPER (i.e., dds_listener_create). This commit brings the listener scheme in line with the rest, retaining the old names as a deprecated interface.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-11-09 12:16:12 +01:00
parent 651bdfee06
commit ec68eeac29
13 changed files with 115 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/ddsc/include/ddsc/dds_public_listener.h
View file

@ -63,21 +63,25 @@ typedef struct c_listener dds_listener_t;
* @return Returns a pointer to the allocated memory for dds_listener_t structure.
*/
_Ret_notnull_
DDS_EXPORT dds_listener_t* dds_listener_create (_In_opt_ void* arg);
DDS_EXPORT dds_listener_t* dds_create_listener (_In_opt_ void* arg);
_Ret_notnull_
DDS_DEPRECATED_EXPORT dds_listener_t* dds_listener_create (_In_opt_ void* arg);
/**
* @brief Delete the memory allocated to listener structure
*
* @param[in] listener pointer to the listener struct to delete
*/
DDS_EXPORT void dds_listener_delete (_In_ _Post_invalid_ dds_listener_t * __restrict listener);
DDS_EXPORT void dds_delete_listener (_In_ _Post_invalid_ dds_listener_t * __restrict listener);
DDS_DEPRECATED_EXPORT void dds_listener_delete (_In_ _Post_invalid_ dds_listener_t * __restrict listener);
/**
* @brief Reset the listener structure contents to ::DDS_LUNSET
*
* @param[in,out] listener pointer to the listener struct to reset
*/
DDS_EXPORT void dds_listener_reset (_Out_ dds_listener_t * __restrict listener);
DDS_EXPORT void dds_reset_listener (_Out_ dds_listener_t * __restrict listener);
DDS_DEPRECATED_EXPORT void dds_listener_reset (_Out_ dds_listener_t * __restrict listener);
/**
* @brief Copy the listener callbacks from source to destination
@ -85,7 +89,8 @@ DDS_EXPORT void dds_listener_reset (_Out_ dds_listener_t * __restrict listener);
* @param[in,out] dst The pointer to the destination listener structure, where the content is to copied
* @param[in] src The pointer to the source listener structure to be copied
*/
DDS_EXPORT void dds_listener_copy (_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src);
DDS_EXPORT void dds_copy_listener (_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src);
DDS_DEPRECATED_EXPORT void dds_listener_copy (_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src);
/**
* @brief Copy the listener callbacks from source to destination, unless already set
@ -96,7 +101,8 @@ DDS_EXPORT void dds_listener_copy (_Out_ dds_listener_t * __restrict dst, _In_ c
* @param[in,out] dst The pointer to the destination listener structure, where the content is merged
* @param[in] src The pointer to the source listener structure to be copied
*/
DDS_EXPORT void dds_listener_merge (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src);
DDS_EXPORT void dds_merge_listener (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src);
DDS_DEPRECATED_EXPORT void dds_listener_merge (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src);
/************************************************************************************************

12
src/core/ddsc/src/dds_entity.c
View file

@ -260,9 +260,9 @@ dds_entity_init(
}
if (listener) {
dds_listener_copy(&e->m_listener, listener);
dds_copy_listener(&e->m_listener, listener);
} else {
dds_listener_reset(&e->m_listener);
dds_reset_listener(&e->m_listener);
}
e->m_hdllink = NULL;
@ -332,7 +332,7 @@ dds_delete_impl(
ut_handle_close(e->m_hdl, e->m_hdllink);
e->m_status_enable = 0;
dds_listener_reset(&e->m_listener);
dds_reset_listener(&e->m_listener);
e->m_trigger |= DDS_DELETING_STATUS;
dds_entity_unlock(e);
@ -643,7 +643,7 @@ dds_get_listener(
rc = dds_entity_lock(entity, DDS_KIND_DONTCARE, &e);
if (rc == DDS_RETCODE_OK) {
dds_entity_cb_wait(e);
dds_listener_copy (listener, &e->m_listener);
dds_copy_listener (listener, &e->m_listener);
dds_entity_unlock(e);
} else {
ret = DDS_ERRNO(rc, "Error occurred on locking entity");
@ -676,9 +676,9 @@ dds_set_listener(
}
dds_entity_cb_wait(e);
if (listener) {
dds_listener_copy(&e->m_listener, listener);
dds_copy_listener(&e->m_listener, listener);
} else {
dds_listener_reset(&e->m_listener);
dds_reset_listener(&e->m_listener);
}
dds_entity_unlock(e);
fail:

42
src/core/ddsc/src/dds_listener.c
View file

@ -18,25 +18,37 @@
_Ret_notnull_
dds_listener_t*
dds_listener_create(_In_opt_ void* arg)
dds_create_listener(_In_opt_ void* arg)
{
c_listener_t *l = dds_alloc(sizeof(*l));
dds_listener_reset(l);
dds_reset_listener(l);
l->arg = arg;
return l;
}
_Ret_notnull_
dds_listener_t*
dds_listener_create(_In_opt_ void* arg)
{
return dds_create_listener(arg);
}
void
dds_listener_delete(_In_ _Post_invalid_ dds_listener_t * __restrict listener)
dds_delete_listener(_In_ _Post_invalid_ dds_listener_t * __restrict listener)
{
if (listener) {
dds_free(listener);
}
}
void
dds_listener_delete(_In_ _Post_invalid_ dds_listener_t * __restrict listener)
{
dds_delete_listener(listener);
}
void
dds_listener_reset(_Out_ dds_listener_t * __restrict listener)
dds_reset_listener(_Out_ dds_listener_t * __restrict listener)
{
if (listener) {
c_listener_t *l = listener;
@ -59,7 +71,13 @@ dds_listener_reset(_Out_ dds_listener_t * __restrict listener)
}
void
dds_listener_copy(_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src)
dds_listener_reset(_Out_ dds_listener_t * __restrict listener)
{
dds_reset_listener(listener);
}
void
dds_copy_listener(_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src)
{
const c_listener_t *srcl = src;
c_listener_t *dstl = dst;
@ -89,7 +107,13 @@ dds_listener_copy(_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener
}
void
dds_listener_merge (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src)
dds_listener_copy(_Out_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src)
{
dds_copy_listener(dst, src);
}
void
dds_merge_listener (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src)
{
const c_listener_t *srcl = src;
c_listener_t *dstl = dst;
@ -143,6 +167,12 @@ dds_listener_merge (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_list
}
}
void
dds_listener_merge (_Inout_ dds_listener_t * __restrict dst, _In_ const dds_listener_t * __restrict src)
{
dds_merge_listener(dst, src);
}
/************************************************************************************************
* Setters
************************************************************************************************/

4
src/core/ddsc/tests/entity_api.c
View file

@ -125,8 +125,8 @@ Test(ddsc_entity, qos, .init = create_entity, .fini = delete_entity)
Test(ddsc_entity, listener, .init = create_entity, .fini = delete_entity)
{
dds_return_t status;
dds_listener_t *l1 = dds_listener_create(NULL);
dds_listener_t *l2 = dds_listener_create(NULL);
dds_listener_t *l1 = dds_create_listener(NULL);
dds_listener_t *l2 = dds_create_listener(NULL);
void *cb1;
void *cb2;

72
src/core/ddsc/tests/listener.c
View file

@ -341,7 +341,7 @@ init_triggering_base(void)
g_topic = dds_create_topic(g_participant, &RoundTripModule_DataType_desc, create_topic_name("ddsc_listener_test", name, 100), NULL, NULL);
cr_assert_gt(g_topic, 0, "Failed to create prerequisite g_topic");
g_listener = dds_listener_create(NULL);
g_listener = dds_create_listener(NULL);
cr_assert_not_null(g_listener, "Failed to create prerequisite g_listener");
g_qos = dds_create_qos();
@ -385,7 +385,7 @@ static void
fini_triggering_base(void)
{
dds_delete_qos(g_qos);
dds_listener_delete(g_listener);
dds_delete_listener(g_listener);
dds_delete(g_participant);
os_condDestroy(&g_cond);
os_mutexDestroy(&g_mutex);
@ -410,7 +410,7 @@ Test(ddsc_listener, create_and_delete)
{
/* Verify create doesn't return null */
dds_listener_t *listener;
listener = dds_listener_create(NULL);
listener = dds_create_listener(NULL);
cr_assert_not_null(listener);
/* Check default cb's are set */
@ -428,16 +428,16 @@ Test(ddsc_listener, create_and_delete)
ASSERT_CALLBACK_EQUAL(subscription_matched, listener, DDS_LUNSET);
ASSERT_CALLBACK_EQUAL(data_available, listener, DDS_LUNSET);
dds_listener_delete(listener);
dds_delete_listener(listener);
OS_WARNING_MSVC_OFF(6387); /* Disable SAL warning on intentional misuse of the API */
dds_listener_delete(NULL);
dds_delete_listener(NULL);
OS_WARNING_MSVC_ON(6387);
}
Test(ddsc_listener, reset)
{
dds_listener_t *listener;
listener = dds_listener_create(NULL);
listener = dds_create_listener(NULL);
cr_assert_not_null(listener);
/* Set a listener cb to a non-default value */
@ -445,20 +445,20 @@ Test(ddsc_listener, reset)
ASSERT_CALLBACK_EQUAL(data_available, listener, NULL);
/* Listener cb should revert to default after reset */
dds_listener_reset(listener);
dds_reset_listener(listener);
ASSERT_CALLBACK_EQUAL(data_available, listener, DDS_LUNSET);
/* Resetting a NULL listener should not crash */
dds_listener_reset(NULL);
dds_reset_listener(NULL);
dds_listener_delete(listener);
dds_delete_listener(listener);
}
Test(ddsc_listener, copy)
{
dds_listener_t *listener1 = NULL, *listener2 = NULL;
listener1 = dds_listener_create(NULL);
listener2 = dds_listener_create(NULL);
listener1 = dds_create_listener(NULL);
listener2 = dds_create_listener(NULL);
cr_assert_not_null(listener1);
cr_assert_not_null(listener2);
@ -471,7 +471,7 @@ Test(ddsc_listener, copy)
ASSERT_CALLBACK_EQUAL(sample_lost, listener2, DDS_LUNSET);
/* Cb's should be copied to listener2 */
dds_listener_copy(listener2, listener1);
dds_copy_listener(listener2, listener1);
ASSERT_CALLBACK_EQUAL(data_available, listener1, NULL);
ASSERT_CALLBACK_EQUAL(data_available, listener2, NULL);
ASSERT_CALLBACK_EQUAL(sample_lost, listener1, sample_lost_cb);
@ -479,20 +479,20 @@ Test(ddsc_listener, copy)
/* Calling copy with NULL should not crash and be noops. */
OS_WARNING_MSVC_OFF(6387); /* Disable SAL warning on intentional misuse of the API */
dds_listener_copy(listener2, NULL);
dds_listener_copy(NULL, listener1);
dds_listener_copy(NULL, NULL);
dds_copy_listener(listener2, NULL);
dds_copy_listener(NULL, listener1);
dds_copy_listener(NULL, NULL);
OS_WARNING_MSVC_ON(6387);
dds_listener_delete(listener1);
dds_listener_delete(listener2);
dds_delete_listener(listener1);
dds_delete_listener(listener2);
}
Test(ddsc_listener, merge)
{
dds_listener_t *listener1 = NULL, *listener2 = NULL;
listener1 = dds_listener_create(NULL);
listener2 = dds_listener_create(NULL);
listener1 = dds_create_listener(NULL);
listener2 = dds_create_listener(NULL);
cr_assert_not_null(listener1);
cr_assert_not_null(listener2);
@ -512,7 +512,7 @@ Test(ddsc_listener, merge)
dds_lset_subscription_matched (listener1, subscription_matched_cb);
/* Merging listener1 into empty listener2 should act a bit like a copy. */
dds_listener_merge(listener2, listener1);
dds_merge_listener(listener2, listener1);
ASSERT_CALLBACK_EQUAL(inconsistent_topic, listener2, inconsistent_topic_cb);
ASSERT_CALLBACK_EQUAL(liveliness_lost, listener2, liveliness_lost_cb);
ASSERT_CALLBACK_EQUAL(offered_deadline_missed, listener2, offered_deadline_missed_cb);
@ -541,7 +541,7 @@ Test(ddsc_listener, merge)
dds_lset_requested_incompatible_qos (listener2, (dds_on_requested_incompatible_qos_fn)callback_dummy);
dds_lset_publication_matched (listener2, (dds_on_publication_matched_fn)callback_dummy);
dds_lset_subscription_matched (listener2, (dds_on_subscription_matched_fn)callback_dummy);
dds_listener_merge(listener2, listener1);
dds_merge_listener(listener2, listener1);
ASSERT_CALLBACK_EQUAL(inconsistent_topic, listener2, (dds_on_inconsistent_topic_fn)callback_dummy);
ASSERT_CALLBACK_EQUAL(liveliness_lost, listener2, (dds_on_liveliness_lost_fn)callback_dummy);
ASSERT_CALLBACK_EQUAL(offered_deadline_missed, listener2, (dds_on_offered_deadline_missed_fn)callback_dummy);
@ -557,18 +557,18 @@ Test(ddsc_listener, merge)
ASSERT_CALLBACK_EQUAL(subscription_matched, listener2, (dds_on_subscription_matched_fn)callback_dummy);
/* Using NULLs shouldn't crash and be noops. */
dds_listener_merge(listener2, NULL);
dds_listener_merge(NULL, listener1);
dds_listener_merge(NULL, NULL);
dds_merge_listener(listener2, NULL);
dds_merge_listener(NULL, listener1);
dds_merge_listener(NULL, NULL);
dds_listener_delete(listener1);
dds_listener_delete(listener2);
dds_delete_listener(listener1);
dds_delete_listener(listener2);
}
Test(ddsc_listener, getters_setters)
{
/* test all individual cb get/set methods */
dds_listener_t *listener = dds_listener_create(NULL);
dds_listener_t *listener = dds_create_listener(NULL);
cr_assert_not_null(listener);
OS_WARNING_MSVC_OFF(6387); /* Disable SAL warning on intentional misuse of the API */ \
@ -587,7 +587,7 @@ Test(ddsc_listener, getters_setters)
TEST_GET_SET(listener, data_available, data_available_cb);
OS_WARNING_MSVC_ON(6387);
dds_listener_delete(listener);
dds_delete_listener(listener);
}
@ -606,28 +606,28 @@ Test(ddsc_listener, propagation, .init=init_triggering_base, .fini=fini_triggeri
memset (&sample, 0, sizeof (sample));
/* Let participant be interested in data. */
listener_par = dds_listener_create(NULL);
listener_par = dds_create_listener(NULL);
cr_assert_not_null(listener_par, "Failed to create prerequisite listener_par");
dds_lset_data_on_readers(listener_par, data_on_readers_cb);
ret = dds_set_listener(g_participant, listener_par);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to set prerequisite listener_par");
dds_listener_delete(listener_par);
dds_delete_listener(listener_par);
/* Let publisher be interested in publication matched. */
listener_pub = dds_listener_create(NULL);
listener_pub = dds_create_listener(NULL);
cr_assert_not_null(listener_pub, "Failed to create prerequisite listener_pub");
dds_lset_publication_matched(listener_pub, publication_matched_cb);
ret = dds_set_listener(g_publisher, listener_pub);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to set prerequisite listener_pub");
dds_listener_delete(listener_pub);
dds_delete_listener(listener_pub);
/* Let subscriber be interested in subscription matched. */
listener_sub = dds_listener_create(NULL);
listener_sub = dds_create_listener(NULL);
cr_assert_not_null(listener_pub, "Failed to create prerequisite listener_sub");
dds_lset_subscription_matched(listener_sub, subscription_matched_cb);
ret = dds_set_listener(g_subscriber, listener_sub);
cr_assert_eq(ret, DDS_RETCODE_OK, "Failed to set prerequisite listener_sub");
dds_listener_delete(listener_sub);
dds_delete_listener(listener_sub);
/* Create reader and writer without listeners. */
g_reader = dds_create_reader(g_subscriber, g_topic, g_qos, NULL);
@ -1022,7 +1022,7 @@ Test(ddsc_listener, inconsistent_topic, .init=init_triggering_base, .fini=fini_t
g_qos = dds_create_qos();
cr_assert_not_null(g_qos, "Failed to create prerequisite g_qos");
g_listener = dds_listener_create(NULL);
g_listener = dds_create_listener(NULL);
cr_assert_not_null(g_listener, "Failed to create prerequisite g_listener");
g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
@ -1055,7 +1055,7 @@ Test(ddsc_listener, inconsistent_topic, .init=init_triggering_base, .fini=fini_t
dds_delete(wr_topic);
dds_delete(g_participant);
dds_listener_delete(g_listener);
dds_delete_listener(g_listener);
dds_delete_qos(g_qos);
}
#endif

12
src/core/ddsc/tests/publisher.c
View file

@ -95,13 +95,13 @@ Test(ddsc_publisher, create)
#endif
/* Use listener(NULL) */
listener = dds_listener_create(NULL);
cr_assert_neq(listener, NULL, "dds_listener_create(NULL)");
listener = dds_create_listener(NULL);
cr_assert_neq(listener, NULL, "dds_create_listener(NULL)");
publisher = dds_create_publisher(participant, NULL, listener);
cr_assert_gt(publisher, 0, "dds_create_publisher(participant,NULL,listener(NULL))");
dds_delete(publisher);
dds_listener_reset(listener);
dds_reset_listener(listener);
/* Use listener for data_available */
dds_lset_data_available(listener, NULL);
@ -109,7 +109,7 @@ Test(ddsc_publisher, create)
cr_assert_gt(publisher, 0, "dds_create_publisher(participant,NULL,listener) with dds_lset_data_available(listener, NULL)");
dds_delete(publisher);
dds_listener_reset(listener);
dds_reset_listener(listener);
/* Use DDS_LUNSET for data_available */
dds_lset_data_available(listener, DDS_LUNSET);
@ -117,7 +117,7 @@ Test(ddsc_publisher, create)
cr_assert_gt(publisher, 0, "dds_create_publisher(participant,NULL,listener) with dds_lset_data_available(listener, DDS_LUNSET)");
dds_delete(publisher);
dds_listener_reset(listener);
dds_reset_listener(listener);
/* Use callback for data_available */
dds_lset_data_available(listener, data_available_cb);
@ -131,7 +131,7 @@ Test(ddsc_publisher, create)
cr_assert_gt(publisher, 0, "dds_create_publisher(participant,qos,listener) with dds_lset_data_available(listener, data_available_cb)");
dds_delete(publisher);
dds_listener_delete(listener);
dds_delete_listener(listener);
dds_delete_qos(qos);
dds_delete (participant);
}

4
src/core/ddsc/tests/reader.c
View file

@ -90,7 +90,7 @@ reader_init(void)
char name[100];
g_qos = dds_create_qos();
g_listener = dds_listener_create(NULL);
g_listener = dds_create_listener(NULL);
g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
cr_assert_gt(g_participant, 0, "Failed to create prerequisite g_participant");
@ -206,7 +206,7 @@ static void
reader_fini(void)
{
dds_delete_qos(g_qos);
dds_listener_delete(g_listener);
dds_delete_listener(g_listener);
dds_delete(g_reader);
dds_delete(g_writer);
dds_delete(g_waitset);

12
src/core/ddsc/tests/subscriber.c
View file

@ -97,25 +97,25 @@ Test(ddsc_subscriber, create) {
/*** Verify listener parameter ***/
listener = dds_listener_create(NULL); /* Use defaults (all listeners unset) */
listener = dds_create_listener(NULL); /* Use defaults (all listeners unset) */
subscriber = dds_create_subscriber(participant, NULL, listener);
cr_assert_gt(subscriber, 0, "dds_create_subscriber: unset listeners");
dds_delete(subscriber);
dds_listener_delete(listener);
dds_delete_listener(listener);
listener = dds_listener_create(NULL);
listener = dds_create_listener(NULL);
dds_lset_data_available(listener, &on_data_available); /* Set on_data_available listener */
subscriber = dds_create_subscriber(participant, NULL, listener);
cr_assert_gt(subscriber, 0, "dds_create_subscriber: on_data_available listener");
dds_delete(subscriber);
dds_listener_delete(listener);
dds_delete_listener(listener);
listener = dds_listener_create(NULL);
listener = dds_create_listener(NULL);
dds_lset_publication_matched(listener, &on_publication_matched); /* Set on_publication_matched listener (ignored, not applicable for subscriber) */
subscriber = dds_create_subscriber(participant, NULL, listener);
cr_assert_gt(subscriber, 0, "dds_create_subscriber: on_publication_matched listener");
dds_delete(subscriber);
dds_listener_delete(listener);
dds_delete_listener(listener);
dds_delete(participant);
}

4
src/core/ddsc/tests/topic.c
View file

@ -61,7 +61,7 @@ ddsc_topic_init(void)
cr_assert_gt(g_topicRtmDataType, 0, "Failed to create prerequisite g_topicRtmDataType");
g_qos = dds_create_qos();
g_listener = dds_listener_create(NULL);
g_listener = dds_create_listener(NULL);
}
@ -69,7 +69,7 @@ static void
ddsc_topic_fini(void)
{
dds_delete_qos(g_qos);
dds_listener_delete(g_listener);
dds_delete_listener(g_listener);
dds_delete(g_topicRtmDataType);
dds_delete(g_topicRtmAddress);
dds_delete(g_participant);

2
src/examples/roundtrip/ping.c
View file

@ -274,7 +274,7 @@ int main (int argc, char *argv[])
if (use_listener)
{
listener = dds_listener_create(NULL);
listener = dds_create_listener(NULL);
dds_lset_data_available(listener, data_available);
}
prepare_dds(&writer, &reader, &readCond, listener);

2
src/examples/roundtrip/pong.c
View file

@ -105,7 +105,7 @@ int main (int argc, char *argv[])
if (use_listener)
{
listener = dds_listener_create(NULL);
listener = dds_create_listener(NULL);
dds_lset_data_available(listener, data_available);
}

4
src/examples/throughput/subscriber.c
View file

@ -374,7 +374,7 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
dds_qset_history (drQos, DDS_HISTORY_KEEP_ALL, 0);
dds_qset_resource_limits (drQos, maxSamples, DDS_LENGTH_UNLIMITED, DDS_LENGTH_UNLIMITED);
rd_listener = dds_listener_create(NULL);
rd_listener = dds_create_listener(NULL);
dds_lset_data_available(rd_listener, data_available_handler);
/* A Read Condition is created which is triggered when data is available to read */
@ -401,7 +401,7 @@ static dds_entity_t prepare_dds(dds_entity_t *reader, const char *partitionName)
*reader = dds_create_reader (subscriber, topic, drQos, rd_listener);
DDS_ERR_CHECK (*reader, DDS_CHECK_REPORT | DDS_CHECK_EXIT);
dds_delete_qos (drQos);
dds_listener_delete(rd_listener);
dds_delete_listener(rd_listener);
return participant;
}

8
src/tools/pubsub/pubsub.c
View file

@ -2159,8 +2159,8 @@ static void set_print_mode(const char *modestr) {
int MAIN(int argc, char *argv[]) {
dds_entity_t sub = 0;
dds_entity_t pub = 0;
dds_listener_t *rdlistener = dds_listener_create(NULL);
dds_listener_t *wrlistener = dds_listener_create(NULL);
dds_listener_t *rdlistener = dds_create_listener(NULL);
dds_listener_t *wrlistener = dds_create_listener(NULL);
dds_qos_t *qos;
const char **qtopic = (const char **) dds_alloc(sizeof(char *) * (unsigned)argc);
@ -2764,8 +2764,8 @@ int MAIN(int argc, char *argv[]) {
}
}
dds_listener_delete(wrlistener);
dds_listener_delete(rdlistener);
dds_delete_listener(wrlistener);
dds_delete_listener(rdlistener);
dds_free((char **) qtopic);
dds_free((char **) qpublisher);