From 703ec372564df46569d767521566783e0ca16e35 Mon Sep 17 00:00:00 2001 From: y-okumura-isp Date: Thu, 13 Feb 2020 11:51:29 +0900 Subject: [PATCH] Use same default values at rcl_parse_arguments & rcl_arguments_copy Signed-off-by: y-okumura-isp --- rcl/src/rcl/arguments.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/rcl/src/rcl/arguments.c b/rcl/src/rcl/arguments.c index 7e499caf8..3a5dfdf0b 100644 --- a/rcl/src/rcl/arguments.c +++ b/rcl/src/rcl/arguments.c @@ -338,10 +338,6 @@ rcl_parse_arguments( return ret; } rcl_arguments_impl_t * args_impl = args_output->impl; - args_impl->log_level = -1; - args_impl->log_stdout_disabled = false; - args_impl->log_rosout_disabled = false; - args_impl->log_ext_lib_disabled = false; if (argc == 0) { // there are no arguments to parse @@ -2069,13 +2065,10 @@ _rcl_allocate_initialized_arguments_impl(rcl_arguments_t * args, rcl_allocator_t return RCL_RET_BAD_ALLOC; } - // TODO(y-okumura-isp): log_level and log_*disabled are initialized in rcl_parse_arguments() - // but not in rcl_arguments_copy(). - // Check they are only forgotten or there is some reason. rcl_arguments_impl_t * args_impl = args->impl; args_impl->num_remap_rules = 0; args_impl->remap_rules = NULL; - // args_impl->log_level = -1; + args_impl->log_level = -1; args_impl->external_log_config_file = NULL; args_impl->unparsed_args = NULL; args_impl->num_unparsed_args = 0; @@ -2084,9 +2077,9 @@ _rcl_allocate_initialized_arguments_impl(rcl_arguments_t * args, rcl_allocator_t args_impl->parameter_overrides = NULL; args_impl->parameter_files = NULL; args_impl->num_param_files_args = 0; - // args_impl->log_stdout_disabled = false; - // args_impl->log_rosout_disabled = false; - // args_impl->log_ext_lib_disabled = false; + args_impl->log_stdout_disabled = false; + args_impl->log_rosout_disabled = false; + args_impl->log_ext_lib_disabled = false; args_impl->allocator = *allocator; return RCL_RET_OK;