Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of strncmp_P() with strncmp()

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

4
libraries/AP_Param/AP_Param.cpp
View File

@ -567,7 +567,7 @@ AP_Param::find_group(const char *name, uint8_t vindex, const struct GroupInfo *g
} else if (type == AP_PARAM_VECTOR3F) { } else if (type == AP_PARAM_VECTOR3F) {
// special case for finding Vector3f elements // special case for finding Vector3f elements
uint8_t suffix_len = strnlen(group_info[i].name, AP_MAX_NAME_SIZE); uint8_t suffix_len = strnlen(group_info[i].name, AP_MAX_NAME_SIZE);
if (strncmp_P(name, group_info[i].name, suffix_len) == 0 && if (strncmp(name, group_info[i].name, suffix_len) == 0 &&
name[suffix_len] == '_' && name[suffix_len] == '_' &&
(name[suffix_len+1] == 'X' || (name[suffix_len+1] == 'X' ||
name[suffix_len+1] == 'Y' || name[suffix_len+1] == 'Y' ||
@ -599,7 +599,7 @@ AP_Param::find(const char *name, enum ap_var_type *ptype)
uint8_t type = PGM_UINT8(&_var_info[i].type); uint8_t type = PGM_UINT8(&_var_info[i].type);
if (type == AP_PARAM_GROUP) { if (type == AP_PARAM_GROUP) {
uint8_t len = strnlen(_var_info[i].name, AP_MAX_NAME_SIZE); uint8_t len = strnlen(_var_info[i].name, AP_MAX_NAME_SIZE);
if (strncmp_P(name, _var_info[i].name, len) != 0) { if (strncmp(name, _var_info[i].name, len) != 0) {
continue; continue;
} }
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);