fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-14 08:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replaced exits with return

Browse Source
This commit is contained in:
devbharat
2015-08-23 13:13:38 +02:00
committed by Lorenz Meier
parent 20d71870ec
commit 8257f3d2fd
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fw_att_control/fw_att_control_main.cpp
+11 -4
View File
@@ -1135,7 +1135,6 @@ FixedwingAttitudeControl::task_main()
_control_task = -1;
_task_running = false;
_exit(0);
}
int
@@ -1163,22 +1162,26 @@ int fw_att_control_main(int argc, char *argv[])
{
if (argc < 2) {
warnx("usage: fw_att_control {start|stop|status}");
return 1;
}
if (!strcmp(argv[1], "start")) {
if (att_control::g_control != nullptr)
warnx("already running");
return 1;
att_control::g_control = new FixedwingAttitudeControl;
if (att_control::g_control == nullptr)
warnx("alloc failed");
return 1;
if (OK != att_control::g_control->start()) {
delete att_control::g_control;
att_control::g_control = nullptr;
warn("start failed");
return 1;
}
/* check if the waiting is necessary at all */
@@ -1192,24 +1195,28 @@ int fw_att_control_main(int argc, char *argv[])
}
printf("\n");
}
exit(0);
return 0;
}
if (!strcmp(argv[1], "stop")) {
if (att_control::g_control == nullptr)
if (att_control::g_control == nullptr){
warnx("not running");
return 1;
}
delete att_control::g_control;
att_control::g_control = nullptr;
exit(0);
return 0;
}
if (!strcmp(argv[1], "status")) {
if (att_control::g_control) {
warnx("running");
return 0;
} else {
warnx("not running");
return 1;
}
}
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
+10 -4
View File
@@ -1824,7 +1824,6 @@ FixedwingPositionControl::task_main()
warnx("exiting.\n");
_control_task = -1;
_exit(0);
}
void FixedwingPositionControl::reset_takeoff_state()
@@ -1976,15 +1975,18 @@ int fw_pos_control_l1_main(int argc, char *argv[])
{
if (argc < 2) {
warnx("usage: fw_pos_control_l1 {start|stop|status}");
return 1;
}
if (!strcmp(argv[1], "start")) {
if (l1_control::g_control != nullptr)
warnx("already running");
return 1;
if (OK != FixedwingPositionControl::start()) {
warn("start failed");
return 1;
}
/* avoid memory fragmentation by not exiting start handler until the task has fully started */
@@ -1995,24 +1997,28 @@ int fw_pos_control_l1_main(int argc, char *argv[])
}
printf("\n");
exit(0);
return 0;
}
if (!strcmp(argv[1], "stop")) {
if (l1_control::g_control == nullptr)
if (l1_control::g_control == nullptr){
warnx("not running");
return 1;
}
delete l1_control::g_control;
l1_control::g_control = nullptr;
exit(0);
return 0;
}
if (!strcmp(argv[1], "status")) {
if (l1_control::g_control) {
warnx("running");
return 0;
} else {
warnx("not running");
return 1;
}
}