Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 01:04:19 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Try not to return an unconditional error from the parameter save path.

Browse Source 
Simplify the test for no parameter file on the parameter load path.
This commit is contained in:
px4dev
2012-08-28 22:54:28 -07:00
parent 1a781c6c4a
commit 168e32cd1b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mavlink/mavlink_parameters.c
+6 -8
View File
@@ -46,6 +46,7 @@
#include <unistd.h>
#include <stdbool.h>
#include <string.h>
#include <errno.h>
#include <systemlib/param/param.h>
#include <systemlib/err.h>
#include <sys/stat.h>
@@ -180,9 +181,10 @@ static int mavlink_pm_save_eeprom()
/* create the file */
int fd = open(mavlink_parameter_file, O_WRONLY | O_CREAT | O_EXCL);
if (fd < 0)
if (fd < 0) {
warn("opening '%s' for writing failed", mavlink_parameter_file);
return -1;
}
int result = param_export(fd, false);
close(fd);
@@ -202,19 +204,15 @@ static int mavlink_pm_save_eeprom()
static int
mavlink_pm_load_eeprom()
{
/* check if eeprom is mounted - if yes and an eeprom open fail is no error */
struct stat buffer;
int eeprom_stat = stat("/eeprom", &buffer);
int fd = open(mavlink_parameter_file, O_RDONLY);
if (fd < 0) {
if (eeprom_stat == OK) {
return 1;
} else {
/* no parameter file is OK, otherwise this is an error */
if (errno != ENOENT) {
warn("open '%s' for reading failed", mavlink_parameter_file);
return -1;
}
return 1;
}
int result = param_import(fd);