Skip to content

Commit 3a09087

Browse files
mergify[bot]bjsowa
andauthored
rclc_parameter: Fix rcl return values (#270) (#277)
Signed-off-by: Błażej Sowa <[email protected]> (cherry picked from commit 56ee3c1) Co-authored-by: Błażej Sowa <[email protected]>
1 parent d5ca470 commit 3a09087

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

rclc_parameter/src/rclc_parameter/parameter_server.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -258,36 +258,36 @@ rclc_parameter_server_init_with_option(
258258
const rosidl_service_type_support_t * get_ts = ROSIDL_GET_SRV_TYPE_SUPPORT(
259259
rcl_interfaces, srv,
260260
GetParameters);
261-
ret &= rclc_parameter_server_init_service(
261+
ret |= rclc_parameter_server_init_service(
262262
&parameter_server->get_service, node, "/get_parameters",
263263
get_ts);
264264

265265
const rosidl_service_type_support_t * get_types_ts = ROSIDL_GET_SRV_TYPE_SUPPORT(
266266
rcl_interfaces,
267267
srv,
268268
GetParameterTypes);
269-
ret &= rclc_parameter_server_init_service(
269+
ret |= rclc_parameter_server_init_service(
270270
&parameter_server->get_types_service, node,
271271
"/get_parameter_types", get_types_ts);
272272

273273
const rosidl_service_type_support_t * set_ts = ROSIDL_GET_SRV_TYPE_SUPPORT(
274274
rcl_interfaces, srv,
275275
SetParameters);
276-
ret &= rclc_parameter_server_init_service(
276+
ret |= rclc_parameter_server_init_service(
277277
&parameter_server->set_service, node, "/set_parameters",
278278
set_ts);
279279

280280
const rosidl_service_type_support_t * list_ts = ROSIDL_GET_SRV_TYPE_SUPPORT(
281281
rcl_interfaces, srv,
282282
ListParameters);
283-
ret &= rclc_parameter_server_init_service(
283+
ret |= rclc_parameter_server_init_service(
284284
&parameter_server->list_service, node,
285285
"/list_parameters", list_ts);
286286

287287
const rosidl_service_type_support_t * describe_ts = ROSIDL_GET_SRV_TYPE_SUPPORT(
288288
rcl_interfaces, srv,
289289
DescribeParameters);
290-
ret &= rclc_parameter_server_init_service(
290+
ret |= rclc_parameter_server_init_service(
291291
&parameter_server->describe_service, node,
292292
"/describe_parameters", describe_ts);
293293

@@ -297,7 +297,7 @@ rclc_parameter_server_init_with_option(
297297
rcl_interfaces,
298298
msg,
299299
ParameterEvent);
300-
ret &= rclc_publisher_init(
300+
ret |= rclc_publisher_init(
301301
&parameter_server->event_publisher, node, event_ts,
302302
"/parameter_events",
303303
&rmw_qos_profile_parameter_events);
@@ -443,14 +443,14 @@ rclc_parameter_server_fini(
443443

444444
rcl_ret_t ret = RCL_RET_OK;
445445

446-
ret &= rcl_service_fini(&parameter_server->list_service, node);
447-
ret &= rcl_service_fini(&parameter_server->set_service, node);
448-
ret &= rcl_service_fini(&parameter_server->get_service, node);
449-
ret &= rcl_service_fini(&parameter_server->get_types_service, node);
450-
ret &= rcl_service_fini(&parameter_server->describe_service, node);
446+
ret |= rcl_service_fini(&parameter_server->list_service, node);
447+
ret |= rcl_service_fini(&parameter_server->set_service, node);
448+
ret |= rcl_service_fini(&parameter_server->get_service, node);
449+
ret |= rcl_service_fini(&parameter_server->get_types_service, node);
450+
ret |= rcl_service_fini(&parameter_server->describe_service, node);
451451

452452
if (parameter_server->notify_changed_over_dds) {
453-
ret &= rcl_publisher_fini(&parameter_server->event_publisher, node);
453+
ret |= rcl_publisher_fini(&parameter_server->event_publisher, node);
454454
}
455455

456456
rosidl_runtime_c__String__fini(&parameter_server->event_list.node);
@@ -531,24 +531,24 @@ rclc_executor_add_parameter_server(
531531
&parameter_server->list_request, &parameter_server->list_response,
532532
rclc_parameter_server_list_service_callback, parameter_server);
533533

534-
ret &= rclc_executor_add_service_with_context(
534+
ret |= rclc_executor_add_service_with_context(
535535
executor, &parameter_server->get_types_service,
536536
&parameter_server->get_types_request, &parameter_server->get_types_response,
537537
rclc_parameter_server_get_types_service_callback, parameter_server);
538538

539-
ret &= rclc_executor_add_service_with_context(
539+
ret |= rclc_executor_add_service_with_context(
540540
executor, &parameter_server->set_service,
541541
&parameter_server->set_request, &parameter_server->set_response,
542542
rclc_parameter_server_set_service_callback,
543543
parameter_server);
544544

545-
ret &= rclc_executor_add_service_with_context(
545+
ret |= rclc_executor_add_service_with_context(
546546
executor, &parameter_server->get_service,
547547
&parameter_server->get_request, &parameter_server->get_response,
548548
rclc_parameter_server_get_service_callback,
549549
parameter_server);
550550

551-
ret &= rclc_executor_add_service_with_context(
551+
ret |= rclc_executor_add_service_with_context(
552552
executor, &parameter_server->describe_service,
553553
&parameter_server->describe_request, &parameter_server->describe_response,
554554
rclc_parameter_server_describe_service_callback,
@@ -799,13 +799,13 @@ rclc_parameter_service_publish_event(
799799
rcl_ret_t ret = RCL_RET_OK;
800800

801801
rcutils_time_point_value_t now;
802-
ret &= rcutils_system_time_now(&now);
802+
ret |= rcutils_system_time_now(&now);
803803

804804
parameter_server->event_list.stamp.sec = RCUTILS_NS_TO_S(now);
805805
parameter_server->event_list.stamp.nanosec =
806806
now - RCUTILS_S_TO_NS(parameter_server->event_list.stamp.sec);
807807

808-
ret &= rcl_publish(
808+
ret |= rcl_publish(
809809
&parameter_server->event_publisher, &parameter_server->event_list,
810810
NULL);
811811

0 commit comments

Comments
 (0)