exclude rcl_validate_enclave_name and rcl_get_security_options_from_e… (backport #24) (#26)

mergify[bot] · 4ntn · pablogs9 · web-flow · commit 3aed6733ce15 · 2025-03-14T07:51:05.000+01:00
* exclude rcl_validate_enclave_name and rcl_get_security_options_from_environment from micro-ROS (#24) Signed-off-by: Antón Casas <antoncasas@eprosima.com> (cherry picked from commit 7fbf5b9) # Conflicts: # rcl/src/rcl/init.c * Fix conflicts --------- Co-authored-by: Antón Casas <antoncasas@eprosima.com> Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c
@@ -185,7 +185,6 @@ rcl_init(
     fail_ret = RCL_RET_BAD_ALLOC;
     goto fail;
   }
-#endif //RCL_COMMAND_LINE_ENABLED
 
   int validation_result;
   size_t invalid_index;
@@ -217,6 +216,7 @@ rcl_init(
     fail_ret = ret;
     goto fail;
   }
+#endif //RCL_COMMAND_LINE_ENABLED
 
   // Initialize rmw_init.
   rmw_ret_t rmw_ret = rmw_init(

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,6 @@ rcl_init(`
`185`	`185`	`fail_ret = RCL_RET_BAD_ALLOC;`
`186`	`186`	`goto fail;`
`187`	`187`	`}`
`188`		`-#endif //RCL_COMMAND_LINE_ENABLED`
`189`	`188`
`190`	`189`	`int validation_result;`
`191`	`190`	`size_t invalid_index;`
`@@ -217,6 +216,7 @@ rcl_init(`
`217`	`216`	`fail_ret = ret;`
`218`	`217`	`goto fail;`
`219`	`218`	`}`
	`219`	`+#endif //RCL_COMMAND_LINE_ENABLED`
`220`	`220`
`221`	`221`	`// Initialize rmw_init.`
`222`	`222`	`rmw_ret_t rmw_ret = rmw_init(`