Fix QoS getter (#292) (#293)

mergify[bot] · Acuadros95 · web-flow · commit 513f0a21ee3a · 2023-04-20T11:23:40.000+02:00
Signed-off-by: acuadros95 <acuadros1995@gmail.com> (cherry picked from commit 7886a89) Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
diff --git a/rmw_microxrcedds_c/src/rmw_client.c b/rmw_microxrcedds_c/src/rmw_client.c
@@ -249,10 +249,11 @@ rmw_client_request_publisher_get_actual_qos(
   const rmw_client_t * client,
   rmw_qos_profile_t * qos)
 {
-  (void) qos;
+  RMW_CHECK_ARGUMENT_FOR_NULL(client, RMW_RET_INVALID_ARGUMENT);
+  RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);
 
   rmw_uxrce_client_t * custom_client = (rmw_uxrce_client_t *)client->data;
-  qos = &custom_client->qos;
+  *qos = custom_client->qos;
 
   return RMW_RET_OK;
 }
@@ -262,10 +263,11 @@ rmw_client_response_subscription_get_actual_qos(
   const rmw_client_t * client,
   rmw_qos_profile_t * qos)
 {
-  (void) qos;
+  RMW_CHECK_ARGUMENT_FOR_NULL(client, RMW_RET_INVALID_ARGUMENT);
+  RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);
 
   rmw_uxrce_client_t * custom_client = (rmw_uxrce_client_t *)client->data;
-  qos = &custom_client->qos;
+  *qos = custom_client->qos;
 
   return RMW_RET_OK;
 }
diff --git a/rmw_microxrcedds_c/src/rmw_publisher.c b/rmw_microxrcedds_c/src/rmw_publisher.c
@@ -282,10 +282,11 @@ rmw_publisher_get_actual_qos(
   const rmw_publisher_t * publisher,
   rmw_qos_profile_t * qos)
 {
-  (void) qos;
+  RMW_CHECK_ARGUMENT_FOR_NULL(publisher, RMW_RET_INVALID_ARGUMENT);
+  RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);
 
   rmw_uxrce_publisher_t * custom_publisher = (rmw_uxrce_publisher_t *)publisher->data;
-  qos = &custom_publisher->qos;
+  *qos = custom_publisher->qos;
 
   return RMW_RET_OK;
 }
diff --git a/rmw_microxrcedds_c/src/rmw_service.c b/rmw_microxrcedds_c/src/rmw_service.c
@@ -247,10 +247,11 @@ rmw_service_response_publisher_get_actual_qos(
   const rmw_service_t * service,
   rmw_qos_profile_t * qos)
 {
-  (void) qos;
+  RMW_CHECK_ARGUMENT_FOR_NULL(service, RMW_RET_INVALID_ARGUMENT);
+  RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);
 
   rmw_uxrce_service_t * custom_service = (rmw_uxrce_service_t *)service->data;
-  qos = &custom_service->qos;
+  *qos = custom_service->qos;
 
   return RMW_RET_OK;
 }
@@ -260,10 +261,11 @@ rmw_service_request_subscription_get_actual_qos(
   const rmw_service_t * service,
   rmw_qos_profile_t * qos)
 {
-  (void) qos;
+  RMW_CHECK_ARGUMENT_FOR_NULL(service, RMW_RET_INVALID_ARGUMENT);
+  RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);
 
   rmw_uxrce_service_t * custom_service = (rmw_uxrce_service_t *)service->data;
-  qos = &custom_service->qos;
+  *qos = custom_service->qos;
 
   return RMW_RET_OK;
 }
diff --git a/rmw_microxrcedds_c/src/rmw_subscription.c b/rmw_microxrcedds_c/src/rmw_subscription.c
@@ -277,10 +277,11 @@ rmw_subscription_get_actual_qos(
   const rmw_subscription_t * subscription,
   rmw_qos_profile_t * qos)
 {
-  (void) qos;
+  RMW_CHECK_ARGUMENT_FOR_NULL(subscription, RMW_RET_INVALID_ARGUMENT);
+  RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);
 
   rmw_uxrce_subscription_t * custom_subscription = (rmw_uxrce_subscription_t *)subscription->data;
-  qos = &custom_subscription->qos;
+  *qos = custom_subscription->qos;
 
   return RMW_RET_OK;
 }

Original file line number	Diff line number	Diff line change
`@@ -249,10 +249,11 @@ rmw_client_request_publisher_get_actual_qos(`
`249`	`249`	`const rmw_client_t * client,`
`250`	`250`	`rmw_qos_profile_t * qos)`
`251`	`251`	`{`
`252`		`- (void) qos;`
	`252`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(client, RMW_RET_INVALID_ARGUMENT);`
	`253`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);`
`253`	`254`
`254`	`255`	`rmw_uxrce_client_t * custom_client = (rmw_uxrce_client_t *)client->data;`
`255`		`- qos = &custom_client->qos;`
	`256`	`+ *qos = custom_client->qos;`
`256`	`257`
`257`	`258`	`return RMW_RET_OK;`
`258`	`259`	`}`
`@@ -262,10 +263,11 @@ rmw_client_response_subscription_get_actual_qos(`
`262`	`263`	`const rmw_client_t * client,`
`263`	`264`	`rmw_qos_profile_t * qos)`
`264`	`265`	`{`
`265`		`- (void) qos;`
	`266`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(client, RMW_RET_INVALID_ARGUMENT);`
	`267`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);`
`266`	`268`
`267`	`269`	`rmw_uxrce_client_t * custom_client = (rmw_uxrce_client_t *)client->data;`
`268`		`- qos = &custom_client->qos;`
	`270`	`+ *qos = custom_client->qos;`
`269`	`271`
`270`	`272`	`return RMW_RET_OK;`
`271`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,10 +282,11 @@ rmw_publisher_get_actual_qos(`
`282`	`282`	`const rmw_publisher_t * publisher,`
`283`	`283`	`rmw_qos_profile_t * qos)`
`284`	`284`	`{`
`285`		`- (void) qos;`
	`285`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(publisher, RMW_RET_INVALID_ARGUMENT);`
	`286`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);`
`286`	`287`
`287`	`288`	`rmw_uxrce_publisher_t * custom_publisher = (rmw_uxrce_publisher_t *)publisher->data;`
`288`		`- qos = &custom_publisher->qos;`
	`289`	`+ *qos = custom_publisher->qos;`
`289`	`290`
`290`	`291`	`return RMW_RET_OK;`
`291`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,10 +247,11 @@ rmw_service_response_publisher_get_actual_qos(`
`247`	`247`	`const rmw_service_t * service,`
`248`	`248`	`rmw_qos_profile_t * qos)`
`249`	`249`	`{`
`250`		`- (void) qos;`
	`250`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(service, RMW_RET_INVALID_ARGUMENT);`
	`251`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);`
`251`	`252`
`252`	`253`	`rmw_uxrce_service_t * custom_service = (rmw_uxrce_service_t *)service->data;`
`253`		`- qos = &custom_service->qos;`
	`254`	`+ *qos = custom_service->qos;`
`254`	`255`
`255`	`256`	`return RMW_RET_OK;`
`256`	`257`	`}`
`@@ -260,10 +261,11 @@ rmw_service_request_subscription_get_actual_qos(`
`260`	`261`	`const rmw_service_t * service,`
`261`	`262`	`rmw_qos_profile_t * qos)`
`262`	`263`	`{`
`263`		`- (void) qos;`
	`264`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(service, RMW_RET_INVALID_ARGUMENT);`
	`265`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);`
`264`	`266`
`265`	`267`	`rmw_uxrce_service_t * custom_service = (rmw_uxrce_service_t *)service->data;`
`266`		`- qos = &custom_service->qos;`
	`268`	`+ *qos = custom_service->qos;`
`267`	`269`
`268`	`270`	`return RMW_RET_OK;`
`269`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,10 +277,11 @@ rmw_subscription_get_actual_qos(`
`277`	`277`	`const rmw_subscription_t * subscription,`
`278`	`278`	`rmw_qos_profile_t * qos)`
`279`	`279`	`{`
`280`		`- (void) qos;`
	`280`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(subscription, RMW_RET_INVALID_ARGUMENT);`
	`281`	`+ RMW_CHECK_ARGUMENT_FOR_NULL(qos, RMW_RET_INVALID_ARGUMENT);`
`281`	`282`
`282`	`283`	`rmw_uxrce_subscription_t * custom_subscription = (rmw_uxrce_subscription_t *)subscription->data;`
`283`		`- qos = &custom_subscription->qos;`
	`284`	`+ *qos = custom_subscription->qos;`
`284`	`285`
`285`	`286`	`return RMW_RET_OK;`
`286`	`287`	`}`