Small cleanups.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
ros2 · Oct 21, 2022 · ee413aa · ee413aa
1 parent df3d483
commit ee413aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/rmw/src/discovery_params.c b/rmw/src/discovery_params.c
@@ -17,17 +17,12 @@
 
 #include "rmw/discovery_params.h"
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 rmw_discovery_params_t
 rmw_get_zero_initialized_discovery_params(void)
 {
   rmw_discovery_params_t result = (rmw_discovery_params_t) {
-           .automatic_discovery_range = RMW_AUTOMATIC_DISCOVERY_RANGE_DEFAULT,
-           .static_peers_count = 0,
+    .automatic_discovery_range = RMW_AUTOMATIC_DISCOVERY_RANGE_DEFAULT,
+    .static_peers_count = 0,
   };  // NOLINT(readability/braces): false positive
   for (size_t ii = 0; ii < RMW_DISCOVERY_PARAMS_MAX_PEERS; ++ii) {
     result.static_peers[ii][0] = '\0';
@@ -48,17 +43,13 @@ rmw_discovery_params_equal(rmw_discovery_params_t * left, rmw_discovery_params_t
 
   for (size_t ii = 0; ii < left->static_peers_count; ++ii) {
     if (strncmp(
-      left->static_peers[ii],
-      right->static_peers[ii],
-      RMW_DISCOVERY_PARAMS_PEER_MAX_LENGTH) != 0)
+        left->static_peers[ii],
+        right->static_peers[ii],
+        RMW_DISCOVERY_PARAMS_PEER_MAX_LENGTH) != 0)
     {
       return false;
     }
   }
 
   return true;
 }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/rmw/src/init_options.c b/rmw/src/init_options.c
@@ -29,8 +29,9 @@ rmw_get_zero_initialized_init_options(void)
            .domain_id = RMW_DEFAULT_DOMAIN_ID,
            .localhost_only = RMW_LOCALHOST_ONLY_DEFAULT,
            .discovery_params = {
-            .automatic_discovery_range = RMW_AUTOMATIC_DISCOVERY_RANGE_DEFAULT,
-            .static_peers_count = 0},
+             .automatic_discovery_range = RMW_AUTOMATIC_DISCOVERY_RANGE_DEFAULT,
+             .static_peers_count = 0
+           },
            .implementation_identifier = NULL,
            .impl = NULL,
            .instance_id = 0,