niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reset error message before setting a new one, embed the original one (#501)

Browse source 
* reset error message before setting a new one, embed the original one

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>

* fix max line length

Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
This commit is contained in:
Dirk Thomas 2019-09-17 08:54:33 -07:00 • committed by GitHub
parent fa20448730
commit a9af082d9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rcl_lifecycle/src/rcl_lifecycle.c
View file

@ -236,14 +236,20 @@ rcl_lifecycle_state_machine_fini(
rcl_ret_t fcn_ret = RCL_RET_OK; rcl_ret_t fcn_ret = RCL_RET_OK;
if (rcl_lifecycle_com_interface_fini(&state_machine->com_interface, node_handle) != RCL_RET_OK) { if (rcl_lifecycle_com_interface_fini(&state_machine->com_interface, node_handle) != RCL_RET_OK) {
RCL_SET_ERROR_MSG("could not free lifecycle com interface. Leaking memory!\n"); rcl_error_string_t error_string = rcl_get_error_string();
rcutils_reset_error();
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"could not free lifecycle com interface. Leaking memory!\n%s", error_string.str);
fcn_ret = RCL_RET_ERROR; fcn_ret = RCL_RET_ERROR;
} }
if (rcl_lifecycle_transition_map_fini( if (rcl_lifecycle_transition_map_fini(
&state_machine->transition_map, allocator) != RCL_RET_OK) &state_machine->transition_map, allocator) != RCL_RET_OK)
{ {
RCL_SET_ERROR_MSG("could not free lifecycle transition map. Leaking memory!\n"); rcl_error_string_t error_string = rcl_get_error_string();
rcutils_reset_error();
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"could not free lifecycle transition map. Leaking memory!\n%s", error_string.str);
fcn_ret = RCL_RET_ERROR; fcn_ret = RCL_RET_ERROR;
} }
@ -333,7 +339,9 @@ _trigger_transition(
rcl_ret_t ret = rcl_lifecycle_com_interface_publish_notification( rcl_ret_t ret = rcl_lifecycle_com_interface_publish_notification(
&state_machine->com_interface, transition->start, state_machine->current_state); &state_machine->com_interface, transition->start, state_machine->current_state);
if (ret != RCL_RET_OK) { if (ret != RCL_RET_OK) {
RCL_SET_ERROR_MSG("Could not publish transition"); rcl_error_string_t error_string = rcl_get_error_string();
rcutils_reset_error();
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Could not publish transition: %s", error_string.str);
return RCL_RET_ERROR; return RCL_RET_ERROR;
} }
} }