diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-02 15:21:37 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-02 15:21:37 +0100 |
| commit | 82c4dbaaa88c2cfc591e402817e6268de708de3b (patch) | |
| tree | 20c9c9b802cd2c7cf60fecbde5333ae431554a94 /apps/systemcmds | |
| parent | 55515f2e7e1aff53cb8f556997f82231c7c104f5 (diff) | |
| download | px4-firmware-82c4dbaaa88c2cfc591e402817e6268de708de3b.tar.gz px4-firmware-82c4dbaaa88c2cfc591e402817e6268de708de3b.tar.bz2 px4-firmware-82c4dbaaa88c2cfc591e402817e6268de708de3b.zip | |
param load / store cleanup, storage location selection now exclusively through dedicated "param select <path>" command
Diffstat (limited to 'apps/systemcmds')
| -rw-r--r-- | apps/systemcmds/param/param.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/systemcmds/param/param.c b/apps/systemcmds/param/param.c index ce701b5ee..210841604 100644 --- a/apps/systemcmds/param/param.c +++ b/apps/systemcmds/param/param.c @@ -96,7 +96,8 @@ param_main(int argc, char *argv[]) } else { param_set_default_file(NULL); } - warnx("selected parameter file %s", param_get_default_file()); + warnx("selected parameter default file %s", param_get_default_file()); + exit(0); } if (!strcmp(argv[1], "show")) @@ -141,17 +142,11 @@ do_load(const char* param_file_name) if (fd < 0) err(1, "open '%s'", param_file_name); - /* set new default file name */ - param_set_default_file(param_file_name); - int result = param_load(fd); close(fd); if (result < 0) { errx(1, "error importing from '%s'", param_file_name); - } else { - /* set default file name for next storage operation */ - param_set_default_file(param_file_name); } exit(0); |