From 2e5ecb2e766a0aba2c1d1effba7305b2edd58092 Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Tue, 15 Jan 2019 09:57:06 +0100 Subject: [PATCH] requiring checking the return value of dds_{get,set}_listener is pedantry Signed-off-by: Erik Boasson --- src/core/ddsc/include/ddsc/dds.h | 4 ++-- src/core/ddsc/src/dds_entity.c | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/core/ddsc/include/ddsc/dds.h b/src/core/ddsc/include/ddsc/dds.h index 65ebead..6c378a2 100644 --- a/src/core/ddsc/include/ddsc/dds.h +++ b/src/core/ddsc/include/ddsc/dds.h @@ -685,7 +685,7 @@ dds_set_qos( */ /* TODO: Link to (generic) Listener and status information. */ _Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK) -DDS_EXPORT _Check_return_ dds_return_t +DDS_EXPORT dds_return_t dds_get_listener( _In_ dds_entity_t entity, _Out_ dds_listener_t * listener); @@ -744,7 +744,7 @@ dds_get_listener( */ /* TODO: Link to (generic) Listener and status information. */ _Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK) -DDS_EXPORT _Check_return_ dds_return_t +DDS_EXPORT dds_return_t dds_set_listener( _In_ dds_entity_t entity, _In_opt_ const dds_listener_t * listener); diff --git a/src/core/ddsc/src/dds_entity.c b/src/core/ddsc/src/dds_entity.c index 7e679f7..843405e 100644 --- a/src/core/ddsc/src/dds_entity.c +++ b/src/core/ddsc/src/dds_entity.c @@ -480,12 +480,7 @@ dds_get_parent( return hdl; } - - -_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK) -_Check_return_ dds_entity_t -dds_get_participant ( - _In_ dds_entity_t entity) +dds_return_t dds_get_listener (dds_entity_t entity, dds_listener_t *listener) { dds_entity *e; dds__retcode_t rc; @@ -663,13 +658,7 @@ dds_get_listener( return ret; } - - -_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK) -_Check_return_ dds_return_t -dds_set_listener( - _In_ dds_entity_t entity, - _In_opt_ const dds_listener_t * listener) +dds_return_t dds_set_listener (dds_entity_t entity, const dds_listener_t *listener) { dds_entity *e; dds__retcode_t rc;