diff options
| author | Julian Oes <joes@student.ethz.ch> | 2012-11-15 11:55:55 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2012-11-15 11:55:55 -0800 |
| commit | 33e750602ab384069b08ca17ca6589c08177f7a6 (patch) | |
| tree | 8f2dbfe7779fc74436ea4ba243e2929c09d5b2ac /apps/systemlib | |
| parent | b7c6a11e6739d217e5df1e79b7f80399ff1fd8f8 (diff) | |
| parent | 3016ae72a3b3b7d7bf1df937fd62a14f53eace6f (diff) | |
| download | px4-firmware-33e750602ab384069b08ca17ca6589c08177f7a6.tar.gz px4-firmware-33e750602ab384069b08ca17ca6589c08177f7a6.tar.bz2 px4-firmware-33e750602ab384069b08ca17ca6589c08177f7a6.zip | |
Merge remote-tracking branch 'upstream/master' into io
Fixed Conflicts:
apps/multirotor_att_control/multirotor_att_control_main.c
rc loss failsafe throttle tested
Diffstat (limited to 'apps/systemlib')
| -rw-r--r-- | apps/systemlib/param/param.c | 4 | ||||
| -rw-r--r-- | apps/systemlib/param/param.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/systemlib/param/param.c b/apps/systemlib/param/param.c index ddf9b0975..ebb72ca3e 100644 --- a/apps/systemlib/param/param.c +++ b/apps/systemlib/param/param.c @@ -517,13 +517,11 @@ param_save_default(void) } int result = param_export(fd, false); - /* should not be necessary, over-careful here */ - fsync(fd); close(fd); if (result != 0) { - unlink(param_get_default_file()); warn("error exporting parameters to '%s'", param_get_default_file()); + unlink(param_get_default_file()); return -2; } diff --git a/apps/systemlib/param/param.h b/apps/systemlib/param/param.h index 6fa73b5a4..084cd931a 100644 --- a/apps/systemlib/param/param.h +++ b/apps/systemlib/param/param.h @@ -250,7 +250,7 @@ __EXPORT int param_set_default_file(const char* filename); * a result of a call to param_set_default_file, or the * built-in default. */ -__EXPORT const char *param_get_default_file(void); +__EXPORT const char* param_get_default_file(void); /** * Save parameters to the default file. |