From 6f3cab1371766922ad1422d03f1259766c11d417 Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Tue, 25 Aug 2020 14:54:48 -0300 Subject: [PATCH] Address peer review comments. Signed-off-by: Michel Hidalgo --- rcl/src/rcl/context.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rcl/src/rcl/context.c b/rcl/src/rcl/context.c index d2cc1fcb3..0624f0f9f 100644 --- a/rcl/src/rcl/context.c +++ b/rcl/src/rcl/context.c @@ -112,7 +112,7 @@ __cleanup_context(rcl_context_t * context) // clean up global_arguments if initialized if (NULL != context->global_arguments.impl) { - rcl_ret_t ret = rcl_arguments_fini(&(context->global_arguments)); + ret = rcl_arguments_fini(&(context->global_arguments)); if (RCL_RET_OK != ret) { RCUTILS_SAFE_FWRITE_TO_STDERR( "[rcl|context.c:" RCUTILS_STRINGIFY(__LINE__) @@ -130,10 +130,10 @@ __cleanup_context(rcl_context_t * context) // finalize init options if valid if (NULL != context->impl->init_options.impl) { - rcl_ret_t inner_ret = rcl_init_options_fini(&(context->impl->init_options)); - if (RCL_RET_OK != inner_ret) { + rcl_ret_t init_options_fini_ret = rcl_init_options_fini(&(context->impl->init_options)); + if (RCL_RET_OK != init_options_fini_ret) { if (RCL_RET_OK == ret) { - ret = inner_ret; + ret = init_options_fini_ret; } RCUTILS_SAFE_FWRITE_TO_STDERR( "[rcl|context.c:" RCUTILS_STRINGIFY(__LINE__) @@ -146,10 +146,10 @@ __cleanup_context(rcl_context_t * context) // clean up rmw_context if (NULL != context->impl->rmw_context.implementation_identifier) { - rmw_ret_t rmw_ret = rmw_context_fini(&(context->impl->rmw_context)); - if (RMW_RET_OK != rmw_ret) { + rmw_ret_t rmw_context_fini_ret = rmw_context_fini(&(context->impl->rmw_context)); + if (RMW_RET_OK != rmw_context_fini_ret) { if (RCL_RET_OK == ret) { - ret = rcl_convert_rmw_ret_to_rcl_ret(rmw_ret); + ret = rcl_convert_rmw_ret_to_rcl_ret(rmw_context_fini_ret); } RCUTILS_SAFE_FWRITE_TO_STDERR( "[rcl|context.c:" RCUTILS_STRINGIFY(__LINE__)