Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-08 18:52:46 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Added assertion on allocation failure for parameter change storage, removed magic numbers

Browse Source
This commit is contained in:
David Sidrane
2015-05-18 13:51:21 -10:00
committed by Lorenz Meier
parent cf2d66bd81
commit 7950167bc5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemlib/param/param.c
+6 -4
View File
@@ -47,6 +47,7 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
#include <assert.h>
#include <fcntl.h>
#include <unistd.h>
#include <systemlib/err.h>
@@ -115,6 +116,7 @@ get_param_info_count(void)
if (!param_changed_storage) {
size_param_changed_storage_bytes = (param_info_count / bits_per_allocation_unit) + 1;
param_changed_storage = calloc(size_param_changed_storage_bytes, 1);
ASSERT(param_changed_storage);
}
return param_info_count;
@@ -316,14 +318,14 @@ param_for_used_index(unsigned index)
int count = 0;
for (unsigned i = 0; i < (unsigned)size_param_changed_storage_bytes; i++) {
for (unsigned j = 0; j < 8; j++) {
for (unsigned j = 0; j < bits_per_allocation_unit; j++) {
if (param_changed_storage[i] & (1 << j)) {
/* we found the right used count,
* return the param value
*/
if (index == count) {
return (param_t)(i * 8 + j);
return (param_t)(i * bits_per_allocation_unit + j);
}
count++;
@@ -357,10 +359,10 @@ param_get_used_index(param_t param)
int count = 0;
for (unsigned i = 0; i < (unsigned)size_param_changed_storage_bytes; i++) {
for (unsigned j = 0; j < 8; j++) {
for (unsigned j = 0; j < bits_per_allocation_unit; j++) {
if (param_changed_storage[i] & (1 << j)) {
if ((unsigned)param == i * 8 + j) {
if ((unsigned)param == i * bits_per_allocation_unit + j) {
return count;
}