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

Avoid C4703 error on UWP (#282)

Browse source 
Signed-off-by: Esteve Fernandez <esteve@apache.org>
This commit is contained in:
Esteve Fernandez 2019-08-01 21:53:08 +02:00 • committed by Dirk Thomas
parent 926da81913
commit 5f1e5438af
1 changed files with 78 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rcl_yaml_param_parser/src/parser.c
View file

@ -168,7 +168,6 @@ static rcutils_ret_t add_name_to_ns(
size_t sep_len;
size_t tot_len;
rcutils_ret_t ret = RCUTILS_RET_OK;
switch (namespace_type) {
case NS_TYPE_NODE:
cur_ns = ns_tracker->node_ns;
@ -181,11 +180,9 @@ static rcutils_ret_t add_name_to_ns(
sep_str = PARAMETER_NS_SEPERATOR;
break;
default:
ret = RCUTILS_RET_ERROR;
break;
return RCUTILS_RET_ERROR;
}
if (RCUTILS_RET_OK == ret) {
/// Add a name to ns
if (NULL == name) {
return RCUTILS_RET_INVALID_ARGUMENT;
@ -227,8 +224,7 @@ static rcutils_ret_t add_name_to_ns(
} else {
ns_tracker->parameter_ns = cur_ns;
}
}
return ret;
return RCUTILS_RET_OK;
}
///
@ -245,7 +241,6 @@ static rcutils_ret_t rem_name_from_ns(
size_t ns_len;
size_t tot_len;
rcutils_ret_t ret = RCUTILS_RET_OK;
switch (namespace_type) {
case NS_TYPE_NODE:
cur_ns = ns_tracker->node_ns;
@ -258,11 +253,9 @@ static rcutils_ret_t rem_name_from_ns(
sep_str = PARAMETER_NS_SEPERATOR;
break;
default:
ret = RCUTILS_RET_ERROR;
break;
return RCUTILS_RET_ERROR;
}
if (RCUTILS_RET_OK == ret) {
/// Remove last name from ns
if (*cur_count > 0U) {
if (1U == *cur_count) {
@ -300,8 +293,7 @@ static rcutils_ret_t rem_name_from_ns(
} else {
ns_tracker->parameter_ns = cur_ns;
}
}
return ret;
return RCUTILS_RET_OK;
}
///