Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace use of strlen_P() with strlen()

This commit is contained in:
Lucas De Marchi 2015-10-25 14:23:25 -02:00 committed by Randy Mackay
parent aa370fe758
commit f8f3f5a024
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Param/AP_Param.cpp
View File

@ -137,7 +137,7 @@ bool AP_Param::check_group_info(const struct AP_Param::GroupInfo * group_info,
return false; return false;
} }
if (ginfo == NULL || if (ginfo == NULL ||
!check_group_info(ginfo, total_size, group_shift + _group_level_shift, prefix_length + strlen_P(group_info[i].name))) { !check_group_info(ginfo, total_size, group_shift + _group_level_shift, prefix_length + strlen(group_info[i].name))) {
return false; return false;
} }
continue; continue;
@ -158,7 +158,7 @@ bool AP_Param::check_group_info(const struct AP_Param::GroupInfo * group_info,
Debug("invalid type in %S", group_info[i].name); Debug("invalid type in %S", group_info[i].name);
return false; return false;
} }
if (prefix_length + strlen_P(group_info[i].name) > 16) { if (prefix_length + strlen(group_info[i].name) > 16) {
Debug("suffix is too long in %S", group_info[i].name); Debug("suffix is too long in %S", group_info[i].name);
return false; return false;
} }
@ -195,7 +195,7 @@ bool AP_Param::check_var_info(void)
} }
const struct GroupInfo *group_info = (const struct GroupInfo *)PGM_POINTER(&_var_info[i].group_info); const struct GroupInfo *group_info = (const struct GroupInfo *)PGM_POINTER(&_var_info[i].group_info);
if (group_info == NULL || if (group_info == NULL ||
!check_group_info(group_info, &total_size, 0, strlen_P(_var_info[i].name))) { !check_group_info(group_info, &total_size, 0, strlen(_var_info[i].name))) {
return false; return false;
} }
} else { } else {