Skip to content

Yaml param parser shane review 2 #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anup-pem merged 2 commits into from
May 25, 2018
Merged

Yaml param parser shane review 2 #241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc36b7a
Don't include unistd.h
sloretz May 24, 2018
9e54504
Use size_t for array indices
sloretz May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions rcl_yaml_param_parser/src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <yaml.h>

#include "rcl_yaml_param_parser/parser.h"
Expand Down Expand Up @@ -398,7 +397,7 @@ void rcl_yaml_node_struct_fini(
const rcl_allocator_t allocator)
{
uint32_t node_idx;
uint32_t parameter_idx = 0U;
size_t parameter_idx = 0U;

if (NULL == params_st) {
return;
Expand Down Expand Up @@ -487,8 +486,8 @@ void rcl_yaml_node_struct_fini(
void rcl_yaml_node_struct_print(
const rcl_params_t * const params_st)
{
uint32_t node_idx;
uint32_t parameter_idx = 0U;
size_t node_idx;
size_t parameter_idx = 0U;

if (NULL == params_st) {
return;
Expand Down Expand Up @@ -528,7 +527,7 @@ void rcl_yaml_node_struct_print(
printf(": %s\n", param_var->string_value);
} else if (NULL != param_var->bool_array_value) {
printf(": ");
for (uint32_t i = 0; i < param_var->bool_array_value->size; i++) {
for (size_t i = 0; i < param_var->bool_array_value->size; i++) {
if (param_var->bool_array_value->values) {
printf("%s, ",
(param_var->bool_array_value->values[i]) ? "true" : "false");
Expand All @@ -537,23 +536,23 @@ void rcl_yaml_node_struct_print(
printf("\n");
} else if (NULL != param_var->integer_array_value) {
printf(": ");
for (uint32_t i = 0; i < param_var->integer_array_value->size; i++) {
for (size_t i = 0; i < param_var->integer_array_value->size; i++) {
if (param_var->integer_array_value->values) {
printf("%" PRId64 ", ", param_var->integer_array_value->values[i]);
}
}
printf("\n");
} else if (NULL != param_var->double_array_value) {
printf(": ");
for (uint32_t i = 0; i < param_var->double_array_value->size; i++) {
for (size_t i = 0; i < param_var->double_array_value->size; i++) {
if (param_var->double_array_value->values) {
printf("%lf, ", param_var->double_array_value->values[i]);
}
}
printf("\n");
} else if (NULL != param_var->string_array_value) {
printf(": ");
for (uint32_t i = 0; i < param_var->string_array_value->size; i++) {
for (size_t i = 0; i < param_var->string_array_value->size; i++) {
if (param_var->string_array_value->data[i]) {
printf("%s, ", param_var->string_array_value->data[i]);
}
Expand Down Expand Up @@ -822,12 +821,12 @@ static rcl_ret_t parse_value(
return RCL_RET_INVALID_ARGUMENT;
}

const uint32_t node_idx = (params_st->num_nodes - 1U);
const size_t node_idx = (params_st->num_nodes - 1U);
if (0U == params_st->params[node_idx].num_params) {
return RCL_RET_INVALID_ARGUMENT;
}

const uint32_t parameter_idx = ((params_st->params[node_idx].num_params) - 1U);
const size_t parameter_idx = ((params_st->params[node_idx].num_params) - 1U);
const size_t val_size = event.data.scalar.length;
const char * value = (char *)event.data.scalar.value;
const uint32_t line_num = ((uint32_t)(event.start_mark.line) + 1U);
Expand Down Expand Up @@ -1010,8 +1009,8 @@ static rcl_ret_t parse_key(
const size_t val_size = event.data.scalar.length;
const char * value = (char *)event.data.scalar.value;
const uint32_t line_num = ((uint32_t)(event.start_mark.line) + 1U);
uint32_t num_nodes;
uint32_t node_idx = 0U;
size_t num_nodes;
size_t node_idx = 0U;

if ((NULL == map_level) || (NULL == params_st)) {
return RCL_RET_INVALID_ARGUMENT;
Expand Down Expand Up @@ -1087,7 +1086,7 @@ static rcl_ret_t parse_key(
case MAP_PARAMS_LVL:
{
char * parameter_ns;
uint32_t parameter_idx;
size_t parameter_idx;
char * param_name;

/// If it is a new map, the previous key is param namespace
Expand Down