Skip to content

Commit 4b9c0a3

Browse files
dirk-thomasdirk-thomas
authored
code style only: wrap after open parenthesis if not in one line (ros2#565)
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
1 parent 7537f83 commit 4b9c0a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+944
-538
lines changed

‎rcl/src/rcl/arguments.c

+76-50
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ rcl_parse_arguments(
397397
if (i + 1 < argc) {
398398
// Attempt to parse next argument as parameter override rule
399399
if (RCL_RET_OK == _rcl_parse_param_rule(argv[i + 1], args_impl->parameter_overrides)) {
400-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
401-
"Got param override rule : %s\n", argv[i + 1]);
400+
RCUTILS_LOG_DEBUG_NAMED(
401+
ROS_PACKAGE_NAME, "Got param override rule : %s\n", argv[i + 1]);
402402
++i; // Skip flag here, for loop will skip rule.
403403
continue;
404404
}
@@ -414,8 +414,8 @@ rcl_parse_arguments(
414414
ret = RCL_RET_INVALID_ROS_ARGS;
415415
goto fail;
416416
}
417-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
418-
"Arg %d (%s) is not a %s nor a %s flag.",
417+
RCUTILS_LOG_DEBUG_NAMED(
418+
ROS_PACKAGE_NAME, "Arg %d (%s) is not a %s nor a %s flag.",
419419
i, argv[i], RCL_PARAM_FLAG, RCL_SHORT_PARAM_FLAG);
420420

421421
// Attempt to parse argument as remap rule flag
@@ -442,9 +442,9 @@ rcl_parse_arguments(
442442
ret = RCL_RET_INVALID_ROS_ARGS;
443443
goto fail;
444444
}
445-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
446-
"Arg %d (%s) is not a %s nor a %s flag.", i,
447-
argv[i], RCL_REMAP_FLAG, RCL_SHORT_REMAP_FLAG);
445+
RCUTILS_LOG_DEBUG_NAMED(
446+
ROS_PACKAGE_NAME, "Arg %d (%s) is not a %s nor a %s flag.",
447+
i, argv[i], RCL_REMAP_FLAG, RCL_SHORT_REMAP_FLAG);
448448

449449
// Attempt to parse argument as parameter file rule
450450
if (strcmp(RCL_PARAM_FILE_FLAG, argv[i]) == 0) {
@@ -457,7 +457,8 @@ rcl_parse_arguments(
457457
&args_impl->parameter_files[args_impl->num_param_files_args]))
458458
{
459459
++(args_impl->num_param_files_args);
460-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
460+
RCUTILS_LOG_DEBUG_NAMED(
461+
ROS_PACKAGE_NAME,
461462
"Got params file : %s\ntotal num param files %d",
462463
args_impl->parameter_files[args_impl->num_param_files_args - 1],
463464
args_impl->num_param_files_args);
@@ -476,8 +477,9 @@ rcl_parse_arguments(
476477
ret = RCL_RET_INVALID_ROS_ARGS;
477478
goto fail;
478479
}
479-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
480-
"Arg %d (%s) is not a %s flag.", i, argv[i], RCL_PARAM_FILE_FLAG);
480+
RCUTILS_LOG_DEBUG_NAMED(
481+
ROS_PACKAGE_NAME, "Arg %d (%s) is not a %s flag.",
482+
i, argv[i], RCL_PARAM_FILE_FLAG);
481483

482484
// Attempt to parse argument as log level configuration
483485
if (strcmp(RCL_LOG_LEVEL_FLAG, argv[i]) == 0) {
@@ -501,25 +503,25 @@ rcl_parse_arguments(
501503
ret = RCL_RET_INVALID_ROS_ARGS;
502504
goto fail;
503505
}
504-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
505-
"Arg %d (%s) is not a %s flag.",
506+
RCUTILS_LOG_DEBUG_NAMED(
507+
ROS_PACKAGE_NAME, "Arg %d (%s) is not a %s flag.",
506508
i, argv[i], RCL_LOG_LEVEL_FLAG);
507509

508510
// Attempt to parse argument as log configuration file
509511
if (strcmp(RCL_EXTERNAL_LOG_CONFIG_FLAG, argv[i]) == 0) {
510512
if (i + 1 < argc) {
511513
if (NULL != args_impl->external_log_config_file) {
512-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
513-
"Overriding log configuration file : %s\n",
514+
RCUTILS_LOG_DEBUG_NAMED(
515+
ROS_PACKAGE_NAME, "Overriding log configuration file : %s\n",
514516
args_impl->external_log_config_file);
515517
allocator.deallocate(args_impl->external_log_config_file, allocator.state);
516518
args_impl->external_log_config_file = NULL;
517519
}
518520
if (RCL_RET_OK == _rcl_parse_external_log_config_file(
519521
argv[i + 1], allocator, &args_impl->external_log_config_file))
520522
{
521-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
522-
"Got log configuration file : %s\n",
523+
RCUTILS_LOG_DEBUG_NAMED(
524+
ROS_PACKAGE_NAME, "Got log configuration file : %s\n",
523525
args_impl->external_log_config_file);
524526
++i; // Skip flag here, for loop will skip value.
525527
continue;
@@ -536,19 +538,21 @@ rcl_parse_arguments(
536538
ret = RCL_RET_INVALID_ROS_ARGS;
537539
goto fail;
538540
}
539-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
540-
"Arg %d (%s) is not a %s flag.",
541+
RCUTILS_LOG_DEBUG_NAMED(
542+
ROS_PACKAGE_NAME, "Arg %d (%s) is not a %s flag.",
541543
i, argv[i], RCL_EXTERNAL_LOG_CONFIG_FLAG);
542544

543545
// Attempt to parse --enable/disable-stdout-logs flag
544546
ret = _rcl_parse_disabling_flag(
545547
argv[i], RCL_LOG_STDOUT_FLAG_SUFFIX, &args_impl->log_stdout_disabled);
546548
if (RCL_RET_OK == ret) {
547-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
548-
"Disable log stdout ? %s\n", args_impl->log_stdout_disabled ? "true" : "false");
549+
RCUTILS_LOG_DEBUG_NAMED(
550+
ROS_PACKAGE_NAME, "Disable log stdout ? %s\n",
551+
args_impl->log_stdout_disabled ? "true" : "false");
549552
continue;
550553
}
551-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
554+
RCUTILS_LOG_DEBUG_NAMED(
555+
ROS_PACKAGE_NAME,
552556
"Couldn't parse arg %d (%s) as %s%s or %s%s flag. Error: %s",
553557
i, argv[i], RCL_ENABLE_FLAG_PREFIX, RCL_LOG_STDOUT_FLAG_SUFFIX,
554558
RCL_DISABLE_FLAG_PREFIX, RCL_LOG_STDOUT_FLAG_SUFFIX, rcl_get_error_string().str);
@@ -558,11 +562,13 @@ rcl_parse_arguments(
558562
ret = _rcl_parse_disabling_flag(
559563
argv[i], RCL_LOG_ROSOUT_FLAG_SUFFIX, &args_impl->log_rosout_disabled);
560564
if (RCL_RET_OK == ret) {
561-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
562-
"Disable log rosout ? %s\n", args_impl->log_rosout_disabled ? "true" : "false");
565+
RCUTILS_LOG_DEBUG_NAMED(
566+
ROS_PACKAGE_NAME, "Disable log rosout ? %s\n",
567+
args_impl->log_rosout_disabled ? "true" : "false");
563568
continue;
564569
}
565-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
570+
RCUTILS_LOG_DEBUG_NAMED(
571+
ROS_PACKAGE_NAME,
566572
"Couldn't parse arg %d (%s) as %s%s or %s%s flag. Error: %s",
567573
i, argv[i], RCL_ENABLE_FLAG_PREFIX, RCL_LOG_ROSOUT_FLAG_SUFFIX,
568574
RCL_DISABLE_FLAG_PREFIX, RCL_LOG_ROSOUT_FLAG_SUFFIX, rcl_get_error_string().str);
@@ -572,11 +578,13 @@ rcl_parse_arguments(
572578
ret = _rcl_parse_disabling_flag(
573579
argv[i], RCL_LOG_EXT_LIB_FLAG_SUFFIX, &args_impl->log_ext_lib_disabled);
574580
if (RCL_RET_OK == ret) {
575-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
576-
"Disable log external lib ? %s\n", args_impl->log_ext_lib_disabled ? "true" : "false");
581+
RCUTILS_LOG_DEBUG_NAMED(
582+
ROS_PACKAGE_NAME, "Disable log external lib ? %s\n",
583+
args_impl->log_ext_lib_disabled ? "true" : "false");
577584
continue;
578585
}
579-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
586+
RCUTILS_LOG_DEBUG_NAMED(
587+
ROS_PACKAGE_NAME,
580588
"Couldn't parse arg %d (%s) as %s%s or %s%s flag. Error: %s",
581589
i, argv[i], RCL_ENABLE_FLAG_PREFIX, RCL_LOG_EXT_LIB_FLAG_SUFFIX,
582590
RCL_DISABLE_FLAG_PREFIX, RCL_LOG_EXT_LIB_FLAG_SUFFIX, rcl_get_error_string().str);
@@ -596,14 +604,16 @@ rcl_parse_arguments(
596604
rcl_remap_t * rule = &(args_impl->remap_rules[args_impl->num_remap_rules]);
597605
*rule = rcl_get_zero_initialized_remap();
598606
if (RCL_RET_OK == _rcl_parse_remap_rule(argv[i], allocator, rule)) {
599-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
607+
RCUTILS_LOG_WARN_NAMED(
608+
ROS_PACKAGE_NAME,
600609
"Found remap rule '%s'. This syntax is deprecated. Use '%s %s %s' instead.",
601610
argv[i], RCL_ROS_ARGS_FLAG, RCL_REMAP_FLAG, argv[i]);
602611
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Got remap rule : %s\n", argv[i + 1]);
603612
++(args_impl->num_remap_rules);
604613
continue;
605614
}
606-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
615+
RCUTILS_LOG_DEBUG_NAMED(
616+
ROS_PACKAGE_NAME,
607617
"Couldn't parse arg %d (%s) as a remap rule in its deprecated form. Error: %s",
608618
i, argv[i], rcl_get_error_string().str);
609619
rcl_reset_error();
@@ -616,31 +626,36 @@ rcl_parse_arguments(
616626
&args_impl->parameter_files[args_impl->num_param_files_args]))
617627
{
618628
++(args_impl->num_param_files_args);
619-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
629+
RCUTILS_LOG_WARN_NAMED(
630+
ROS_PACKAGE_NAME,
620631
"Found parameter file rule '%s'. This syntax is deprecated. Use '%s %s %s' instead.",
621632
argv[i], RCL_ROS_ARGS_FLAG, RCL_PARAM_FILE_FLAG,
622633
args_impl->parameter_files[args_impl->num_param_files_args - 1]);
623-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
634+
RCUTILS_LOG_DEBUG_NAMED(
635+
ROS_PACKAGE_NAME,
624636
"params rule : %s\n total num param rules %d",
625637
args_impl->parameter_files[args_impl->num_param_files_args - 1],
626638
args_impl->num_param_files_args);
627639
continue;
628640
}
629-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
641+
RCUTILS_LOG_DEBUG_NAMED(
642+
ROS_PACKAGE_NAME,
630643
"Couldn't parse arg %d (%s) as a deprecated parameter file rule. Error: %s",
631644
i, argv[i], rcl_get_error_string().str);
632645
rcl_reset_error();
633646

634647
// Attempt to parse argument as log level configuration
635648
int log_level;
636649
if (RCL_RET_OK == _rcl_parse_log_level_rule(argv[i], allocator, &log_level)) {
637-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
650+
RCUTILS_LOG_WARN_NAMED(
651+
ROS_PACKAGE_NAME,
638652
"Found log level rule '%s'. This syntax is deprecated. Use '%s %s %s' instead.",
639653
argv[i], RCL_ROS_ARGS_FLAG, RCL_LOG_LEVEL_FLAG, g_rcutils_log_severity_names[log_level]);
640654
args_impl->log_level = log_level;
641655
continue;
642656
}
643-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
657+
RCUTILS_LOG_DEBUG_NAMED(
658+
ROS_PACKAGE_NAME,
644659
"Couldn't parse arg %d (%s) as a deprecated log level rule. Error: %s",
645660
i, argv[i], rcl_get_error_string().str);
646661
rcl_reset_error();
@@ -649,16 +664,18 @@ rcl_parse_arguments(
649664
rcl_ret_t ret = _rcl_parse_external_log_config_file_rule(
650665
argv[i], allocator, &args_impl->external_log_config_file);
651666
if (RCL_RET_OK == ret) {
652-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
667+
RCUTILS_LOG_WARN_NAMED(
668+
ROS_PACKAGE_NAME,
653669
"Found log config rule '%s'. This syntax is deprecated. Use '%s %s %s' instead.",
654670
argv[i], RCL_ROS_ARGS_FLAG, RCL_EXTERNAL_LOG_CONFIG_FLAG,
655671
args_impl->external_log_config_file);
656-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
657-
"Got log configuration file : %s\n",
672+
RCUTILS_LOG_DEBUG_NAMED(
673+
ROS_PACKAGE_NAME, "Got log configuration file : %s\n",
658674
args_impl->external_log_config_file);
659675
continue;
660676
}
661-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
677+
RCUTILS_LOG_DEBUG_NAMED(
678+
ROS_PACKAGE_NAME,
662679
"Couldn't parse arg %d (%s) as a deprecated log config rule. Error: %s",
663680
i, argv[i], rcl_get_error_string().str);
664681
rcl_reset_error();
@@ -669,14 +686,17 @@ rcl_parse_arguments(
669686
if (RCL_RET_OK == ret) {
670687
const char * flag_prefix =
671688
args_impl->log_stdout_disabled ? RCL_DISABLE_FLAG_PREFIX : RCL_ENABLE_FLAG_PREFIX;
672-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
689+
RCUTILS_LOG_WARN_NAMED(
690+
ROS_PACKAGE_NAME,
673691
"Found '%s'. This syntax is deprecated. Use '%s %s%s' instead.",
674692
argv[i], RCL_ROS_ARGS_FLAG, flag_prefix, RCL_LOG_STDOUT_FLAG_SUFFIX);
675-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
676-
"Disable log stdout ? %s\n", args_impl->log_stdout_disabled ? "true" : "false");
693+
RCUTILS_LOG_DEBUG_NAMED(
694+
ROS_PACKAGE_NAME, "Disable log stdout ? %s\n",
695+
args_impl->log_stdout_disabled ? "true" : "false");
677696
continue;
678697
}
679-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
698+
RCUTILS_LOG_DEBUG_NAMED(
699+
ROS_PACKAGE_NAME,
680700
"Couldn't parse arg %d (%s) as a deprecated log_stdout_disabled rule. Error: %s",
681701
i, argv[i], rcl_get_error_string().str);
682702
rcl_reset_error();
@@ -687,14 +707,17 @@ rcl_parse_arguments(
687707
if (RCL_RET_OK == ret) {
688708
const char * flag_prefix =
689709
args_impl->log_rosout_disabled ? RCL_DISABLE_FLAG_PREFIX : RCL_ENABLE_FLAG_PREFIX;
690-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
710+
RCUTILS_LOG_WARN_NAMED(
711+
ROS_PACKAGE_NAME,
691712
"Found '%s'. This syntax is deprecated. Use '%s %s%s' instead.",
692713
argv[i], RCL_ROS_ARGS_FLAG, flag_prefix, RCL_LOG_ROSOUT_FLAG_SUFFIX);
693-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
694-
"Disable log rosout ? %s\n", args_impl->log_rosout_disabled ? "true" : "false");
714+
RCUTILS_LOG_DEBUG_NAMED(
715+
ROS_PACKAGE_NAME, "Disable log rosout ? %s\n",
716+
args_impl->log_rosout_disabled ? "true" : "false");
695717
continue;
696718
}
697-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
719+
RCUTILS_LOG_DEBUG_NAMED(
720+
ROS_PACKAGE_NAME,
698721
"Couldn't parse arg %d (%s) as a deprecated log_rosout_disabled rule. Error: %s",
699722
i, argv[i], rcl_get_error_string().str);
700723
rcl_reset_error();
@@ -705,14 +728,17 @@ rcl_parse_arguments(
705728
if (RCL_RET_OK == ret) {
706729
const char * flag_prefix =
707730
args_impl->log_ext_lib_disabled ? RCL_DISABLE_FLAG_PREFIX : RCL_ENABLE_FLAG_PREFIX;
708-
RCUTILS_LOG_WARN_NAMED(ROS_PACKAGE_NAME,
731+
RCUTILS_LOG_WARN_NAMED(
732+
ROS_PACKAGE_NAME,
709733
"Found '%s'. This syntax is deprecated. Use '%s %s%s' instead.",
710734
argv[i], RCL_ROS_ARGS_FLAG, flag_prefix, RCL_LOG_EXT_LIB_FLAG_SUFFIX);
711-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
712-
"Disable log external lib ? %s\n", args_impl->log_ext_lib_disabled ? "true" : "false");
735+
RCUTILS_LOG_DEBUG_NAMED(
736+
ROS_PACKAGE_NAME, "Disable log external lib ? %s\n",
737+
args_impl->log_ext_lib_disabled ? "true" : "false");
713738
continue;
714739
}
715-
RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME,
740+
RCUTILS_LOG_DEBUG_NAMED(
741+
ROS_PACKAGE_NAME,
716742
"Couldn't parse arg %d (%s) as a deprecated log_ext_lib_disabled rule. Error: %s",
717743
i, argv[i], rcl_get_error_string().str);
718744
rcl_reset_error();

‎rcl/src/rcl/init.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ rcl_shutdown(rcl_context_t * context)
186186
}
187187

188188
rcl_ret_t rcl_ret = rcl_logging_fini();
189-
RCUTILS_LOG_ERROR_EXPRESSION_NAMED(RCL_RET_OK != rcl_ret, ROS_PACKAGE_NAME,
189+
RCUTILS_LOG_ERROR_EXPRESSION_NAMED(
190+
RCL_RET_OK != rcl_ret, ROS_PACKAGE_NAME,
190191
"Failed to fini logging, rcl_ret_t: %i, rcl_error_str: %s", rcl_ret,
191192
rcl_get_error_string().str);
192193
rcl_reset_error();

‎rcl/src/rcl/logging_rosout.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ rcl_ret_t rcl_logging_rosout_init(
9393
return RCL_RET_OK;
9494
}
9595
__logger_map = rcutils_get_zero_initialized_hash_map();
96-
RCL_RET_FROM_RCUTIL_RET(status,
97-
rcutils_hash_map_init(&__logger_map, 2, sizeof(const char *), sizeof(rosout_map_entry_t),
98-
rcutils_hash_map_string_hash_func, rcutils_hash_map_string_cmp_func, allocator));
96+
RCL_RET_FROM_RCUTIL_RET(
97+
status,
98+
rcutils_hash_map_init(
99+
&__logger_map, 2, sizeof(const char *), sizeof(rosout_map_entry_t),
100+
rcutils_hash_map_string_hash_func, rcutils_hash_map_string_cmp_func, allocator));
99101
if (RCL_RET_OK == status) {
100102
__rosout_allocator = *allocator;
101103
__is_initialized = true;
@@ -111,8 +113,8 @@ rcl_ret_t rcl_logging_rosout_fini()
111113
rosout_map_entry_t entry;
112114

113115
// fini all the outstanding publishers
114-
rcutils_ret_t hashmap_ret = rcutils_hash_map_get_next_key_and_data(&__logger_map, NULL, &key,
115-
&entry);
116+
rcutils_ret_t hashmap_ret = rcutils_hash_map_get_next_key_and_data(
117+
&__logger_map, NULL, &key, &entry);
116118
while (RCL_RET_OK == status && RCUTILS_RET_OK == hashmap_ret) {
117119
// Teardown publisher
118120
status = rcl_publisher_fini(&entry.publisher, entry.node);
@@ -157,7 +159,8 @@ rcl_ret_t rcl_logging_rosout_init_publisher_for_node(
157159
if (rcutils_hash_map_key_exists(&__logger_map, &logger_name)) {
158160
// @TODO(nburek) Update behavior to either enforce unique names or work with non-unique
159161
// names based on the outcome here: https://github.com/ros2/design/issues/187
160-
RCUTILS_LOG_WARN_NAMED("rcl.logging_rosout",
162+
RCUTILS_LOG_WARN_NAMED(
163+
"rcl.logging_rosout",
161164
"Publisher already registered for provided node name. If this is due to multiple nodes "
162165
"with the same name then all logs for that logger name will go out over the existing "
163166
"publisher. As soon as any node with that name is destructed it will unregister the "

‎rcl/src/rcl/node.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ rcl_node_init(
381381
node->impl->logger_name)
382382
{
383383
ret = rcl_logging_rosout_fini_publisher_for_node(node);
384-
RCUTILS_LOG_ERROR_EXPRESSION_NAMED((ret != RCL_RET_OK && ret != RCL_RET_NOT_INIT),
384+
RCUTILS_LOG_ERROR_EXPRESSION_NAMED(
385+
(ret != RCL_RET_OK && ret != RCL_RET_NOT_INIT),
385386
ROS_PACKAGE_NAME, "Failed to fini publisher for node: %i", ret);
386387
allocator->deallocate((char *)node->impl->logger_name, allocator->state);
387388
}

‎rcl/src/rcl/publisher.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ rcl_publisher_init(
169169
remapped_topic_name,
170170
&(options->qos),
171171
&(options->rmw_publisher_options));
172-
RCL_CHECK_FOR_NULL_WITH_MSG(publisher->impl->rmw_handle,
173-
rmw_get_error_string().str, goto fail);
172+
RCL_CHECK_FOR_NULL_WITH_MSG(
173+
publisher->impl->rmw_handle, rmw_get_error_string().str, goto fail);
174174
// get actual qos, and store it
175175
rmw_ret = rmw_publisher_get_actual_qos(
176176
publisher->impl->rmw_handle,
@@ -303,8 +303,8 @@ rcl_publish_serialized_message(
303303
return RCL_RET_PUBLISHER_INVALID; // error already set
304304
}
305305
RCL_CHECK_ARGUMENT_FOR_NULL(serialized_message, RCL_RET_INVALID_ARGUMENT);
306-
rmw_ret_t ret = rmw_publish_serialized_message(publisher->impl->rmw_handle, serialized_message,
307-
allocation);
306+
rmw_ret_t ret = rmw_publish_serialized_message(
307+
publisher->impl->rmw_handle, serialized_message, allocation);
308308
if (ret != RMW_RET_OK) {
309309
RCL_SET_ERROR_MSG(rmw_get_error_string().str);
310310
if (ret == RMW_RET_BAD_ALLOC) {
@@ -420,8 +420,8 @@ rcl_publisher_get_subscription_count(
420420
}
421421
RCL_CHECK_ARGUMENT_FOR_NULL(subscription_count, RCL_RET_INVALID_ARGUMENT);
422422

423-
rmw_ret_t ret = rmw_publisher_count_matched_subscriptions(publisher->impl->rmw_handle,
424-
subscription_count);
423+
rmw_ret_t ret = rmw_publisher_count_matched_subscriptions(
424+
publisher->impl->rmw_handle, subscription_count);
425425

426426
if (ret != RMW_RET_OK) {
427427
RCL_SET_ERROR_MSG(rmw_get_error_string().str);

0 commit comments

Comments
 (0)