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

use new error handling API from rcutils (#314)

Browse source 
* use new error handling API from rcutils

Signed-off-by: William Woodall <william@osrfoundation.org>

* use semicolons after macros

Signed-off-by: William Woodall <william@osrfoundation.org>

* use new error handling API from rcutils

Signed-off-by: William Woodall <william@osrfoundation.org>

* minimize vertical whitespace

Signed-off-by: William Woodall <william@osrfoundation.org>

* use semicolons after macros

Signed-off-by: William Woodall <william@osrfoundation.org>
This commit is contained in:
William Woodall 2018-11-01 21:08:31 -05:00 • committed by GitHub
parent 765de78140
commit 4d8cb487f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 1131 additions and 1314 deletions
Download patch file Download diff file Expand all files Collapse all files

126
rcl_yaml_param_parser/src/parser.c
View file

@ -197,8 +197,7 @@ static rcl_ret_t add_name_to_ns(
tot_len = ns_len + sep_len + name_len + 1U;
if (tot_len > MAX_STRING_SIZE) {
RCL_SET_ERROR_MSG("New namespace string is exceeding max string size",
allocator);
RCL_SET_ERROR_MSG("New namespace string is exceeding max string size");
return RCL_RET_ERROR;
}
cur_ns = allocator.reallocate(cur_ns, tot_len, allocator.state);
@ -266,7 +265,7 @@ static rcl_ret_t rem_name_from_ns(
next_str = strstr(cur_ns, sep_str);
while (NULL != next_str) {
if (next_str > end_ptr) {
RCL_SET_ERROR_MSG("Internal error. Crossing arrau boundary", allocator);
RCL_SET_ERROR_MSG("Internal error. Crossing arrau boundary");
return RCL_RET_ERROR;
}
last_idx = next_str;
@ -719,7 +718,7 @@ static void * get_value(
char * endptr = NULL;
if ((NULL == value) || (NULL == val_type)) {
RCL_SET_ERROR_MSG("Invalid arguments", allocator);
RCL_SET_ERROR_MSG("Invalid arguments");
return NULL;
}
@ -839,12 +838,12 @@ static rcl_ret_t parse_value(
rcl_variant_t * param_value;
if (val_size > MAX_STRING_SIZE) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Scalar value at line %d"
" is bigger than %d bytes", line_num, MAX_STRING_SIZE);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Scalar value at line %d is bigger than %d bytes", line_num, MAX_STRING_SIZE);
return RCL_RET_ERROR;
} else {
if (0U == val_size) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "No value at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("No value at line %d", line_num);
return RCL_RET_ERROR;
}
}
@ -854,7 +853,7 @@ static rcl_ret_t parse_value(
}
if (NULL == params_st->params[node_idx].parameter_values) {
RCL_SET_ERROR_MSG("Internal error: Invalid mem", allocator);
RCL_SET_ERROR_MSG("Internal error: Invalid mem");
return RCL_RET_BAD_ALLOC;
}
@ -863,15 +862,14 @@ static rcl_ret_t parse_value(
// param_value->string_value = rcutils_strdup(value, allocator);
ret_val = get_value(value, &val_type, allocator);
if (NULL == ret_val) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Error parsing value %s at"
" line %d", value, line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Error parsing value %s at line %d", value, line_num);
return RCL_RET_ERROR;
}
switch (val_type) {
case DATA_TYPE_UNKNOWN:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Unknown data type of"
" value %s at line %d\n", value, line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Unknown data type of value %s at line %d\n", value, line_num);
res = RCL_RET_ERROR;
break;
case DATA_TYPE_BOOL:
@ -888,8 +886,9 @@ static rcl_ret_t parse_value(
}
} else {
if (*seq_data_type != val_type) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Sequence should be of same"
" type. Value type 'bool' do not belong at line_num %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Sequence should be of same type. Value type 'bool' do not belong at line_num %d",
line_num);
allocator.deallocate(ret_val, allocator.state);
return RCL_RET_ERROR;
}
@ -917,8 +916,9 @@ static rcl_ret_t parse_value(
}
} else {
if (*seq_data_type != val_type) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Sequence should be of same"
" type. Value type 'integer' do not belong at line_num %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Sequence should be of same type. Value type 'integer' do not belong at line_num %d",
line_num);
allocator.deallocate(ret_val, allocator.state);
return RCL_RET_ERROR;
}
@ -946,8 +946,9 @@ static rcl_ret_t parse_value(
}
} else {
if (*seq_data_type != val_type) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Sequence should be of same"
" type. Value type 'double' do not belong at line_num %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Sequence should be of same type. Value type 'double' do not belong at line_num %d",
line_num);
allocator.deallocate(ret_val, allocator.state);
return RCL_RET_ERROR;
}
@ -978,8 +979,9 @@ static rcl_ret_t parse_value(
}
} else {
if (*seq_data_type != val_type) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Sequence should be of same"
" type. Value type 'string' do not belong at line_num %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Sequence should be of same type. Value type 'string' do not belong at line_num %d",
line_num);
allocator.deallocate(ret_val, allocator.state);
return RCL_RET_ERROR;
}
@ -994,8 +996,8 @@ static rcl_ret_t parse_value(
}
break;
default:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Unknown data type of value"
" %s at line %d", value, line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Unknown data type of value %s at line %d", value, line_num);
res = RCL_RET_ERROR;
break;
}
@ -1026,12 +1028,13 @@ static rcl_ret_t parse_key(
allocator = params_st->allocator;
if (val_size > MAX_STRING_SIZE) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Scalar value at line %d"
" is bigger than %d bytes", line_num, MAX_STRING_SIZE);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Scalar value at line %d is bigger than %d bytes",
line_num, MAX_STRING_SIZE);
return RCL_RET_ERROR;
} else {
if (0U == val_size) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "No key at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("No key at line %d", line_num);
return RCL_RET_ERROR;
}
}
@ -1046,8 +1049,7 @@ static rcl_ret_t parse_key(
switch (*map_level) {
case MAP_UNINIT_LVL:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Unintialized map level"
" at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Unintialized map level at line %d", line_num);
res = RCL_RET_ERROR;
break;
case MAP_NODE_NAME_LVL:
@ -1056,14 +1058,14 @@ static rcl_ret_t parse_key(
if (0 != strncmp(PARAMS_KEY, value, strlen(PARAMS_KEY))) {
res = add_name_to_ns(ns_tracker, value, NS_TYPE_NODE, allocator);
if (RCL_RET_OK != res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Internal error"
" adding node namespace at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Internal error adding node namespace at line %d", line_num);
return res;
}
} else {
if (0U == ns_tracker->num_node_ns) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "There are no node names"
" before %s at line %d", PARAMS_KEY, line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"There are no node names before %s at line %d", PARAMS_KEY, line_num);
return RCL_RET_ERROR;
}
/// The previous key(last name in namespace) was the node name. Remove it
@ -1076,14 +1078,14 @@ static rcl_ret_t parse_key(
res = rem_name_from_ns(ns_tracker, NS_TYPE_NODE, allocator);
if (RCL_RET_OK != res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Internal error"
" adding node namespace at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Internal error adding node namespace at line %d", line_num);
return res;
}
res = node_params_init(&(params_st->params[num_nodes]), allocator);
if (RCL_RET_OK != res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Error creating node"
" parameter at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Error creating node parameter at line %d", line_num);
return RCL_RET_ERROR;
}
params_st->num_nodes++;
@ -1104,15 +1106,15 @@ static rcl_ret_t parse_key(
parameter_idx = params_st->params[node_idx].num_params;
parameter_ns = params_st->params[node_idx].parameter_names[parameter_idx];
if (NULL == parameter_ns) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Internal error"
" creating param namespace at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Internal error creating param namespace at line %d", line_num);
return RCL_RET_ERROR;
}
res = replace_ns(ns_tracker, parameter_ns, (ns_tracker->num_parameter_ns + 1U),
NS_TYPE_PARAM, allocator);
if (RCL_RET_OK != res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Internal error replacing"
" namespace at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Internal error replacing namespace at line %d", line_num);
return RCL_RET_ERROR;
}
*is_new_map = false;
@ -1131,8 +1133,8 @@ static rcl_ret_t parse_key(
const size_t tot_len = (params_ns_len + param_name_len + 2U);
if (tot_len > MAX_STRING_SIZE) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "The name length"
" exceeds the MAX size %d at line %d", MAX_STRING_SIZE, line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"The name length exceeds the MAX size %d at line %d", MAX_STRING_SIZE, line_num);
return RCL_RET_OK;
}
@ -1151,8 +1153,7 @@ static rcl_ret_t parse_key(
}
break;
default:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Unknown map level at"
" line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Unknown map level at line %d", line_num);
res = RCL_RET_ERROR;
break;
}
@ -1190,8 +1191,7 @@ static rcl_ret_t parse_events(
}
res = yaml_parser_parse(parser, &event);
if (0 == res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Error parsing a"
" event near line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Error parsing a event near line %d", line_num);
return RCL_RET_ERROR;
} else {
res = RCL_RET_OK;
@ -1216,8 +1216,8 @@ static rcl_ret_t parse_events(
} else {
/// It is a value
if (map_level < (uint32_t)(MAP_PARAMS_LVL)) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Cannot have a value"
" before %s at line %d", PARAMS_KEY, line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Cannot have a value before %s at line %d", PARAMS_KEY, line_num);
yaml_event_delete(&event);
return RCL_RET_ERROR;
}
@ -1235,14 +1235,13 @@ static rcl_ret_t parse_events(
break;
case YAML_SEQUENCE_START_EVENT:
if (true == is_key) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Sequences cannot be key"
" at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Sequences cannot be key at line %d", line_num);
yaml_event_delete(&event);
return RCL_RET_ERROR;
}
if (map_level < (uint32_t)(MAP_PARAMS_LVL)) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Sequences can only be"
" values and not keys in params. Error at line %d\n", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Sequences can only be values and not keys in params. Error at line %d\n", line_num);
yaml_event_delete(&event);
return RCL_RET_ERROR;
}
@ -1273,8 +1272,8 @@ static rcl_ret_t parse_events(
/// Remove param namesapce
res = rem_name_from_ns(ns_tracker, NS_TYPE_PARAM, allocator);
if (RCL_RET_OK != res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Internal error"
" removing parameter namespace at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Internal error removing parameter namespace at line %d", line_num);
yaml_event_delete(&event);
return res;
}
@ -1288,8 +1287,8 @@ static rcl_ret_t parse_events(
/// Remove node namespace
res = rem_name_from_ns(ns_tracker, NS_TYPE_NODE, allocator);
if (RCL_RET_OK != res) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Internal error"
" removing node namespace at line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Internal error removing node namespace at line %d", line_num);
yaml_event_delete(&event);
return res;
}
@ -1299,8 +1298,8 @@ static rcl_ret_t parse_events(
yaml_event_delete(&event);
break;
case YAML_ALIAS_EVENT:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Will not support aliasing"
" at line %d\n", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Will not support aliasing at line %d\n", line_num);
res = RCL_RET_ERROR;
yaml_event_delete(&event);
break;
@ -1314,14 +1313,13 @@ static rcl_ret_t parse_events(
yaml_event_delete(&event);
break;
case YAML_NO_EVENT:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Received an empty event at"
" line %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Received an empty event at line %d", line_num);
res = RCL_RET_ERROR;
yaml_event_delete(&event);
break;
default:
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING(allocator, "Unknown YAML event at line"
" %d", line_num);
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Unknown YAML event at line %d", line_num);
res = RCL_RET_ERROR;
yaml_event_delete(&event);
break;
@ -1354,20 +1352,20 @@ bool rcl_parse_yaml_file(
allocator = params_st->allocator;
if (NULL == file_path) {
RCL_SET_ERROR_MSG("YAML file path is NULL", allocator);
RCL_SET_ERROR_MSG("YAML file path is NULL");
return false;
}
res = yaml_parser_initialize(&parser);
if (0 == res) {
RCL_SET_ERROR_MSG("Could not initialize the parser", allocator);
RCL_SET_ERROR_MSG("Could not initialize the parser");
return false;
}
yaml_file = fopen(file_path, "r");
if (NULL == yaml_file) {
yaml_parser_delete(&parser);
RCL_SET_ERROR_MSG("Error opening YAML file", allocator);
RCL_SET_ERROR_MSG("Error opening YAML file");
return false;
}