Skip to content
Snippets Groups Projects
Commit fe502ffd authored by Beat Küng's avatar Beat Küng
Browse files

fix tone_alarm: avoid using exit()

On POSIX it exits the process.
parent 92461101
No related branches found
No related tags found
No related merge requests found
......@@ -460,7 +460,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) {
PX4_ERR("already started");
exit(1);
return 1;
}
if (g_dev == nullptr) {
......@@ -468,33 +468,33 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1);
return 1;
}
if (OK != g_dev->init()) {
delete g_dev;
g_dev = nullptr;
PX4_ERR("ToneAlarm init failed");
exit(1);
return 1;
}
}
exit(0);
return 0;
}
if (!strcmp(argv1, "stop")) {
delete g_dev;
g_dev = nullptr;
exit(0);
return 0;
}
if (!strcmp(argv1, "status")) {
g_dev->status();
exit(0);
return 0;
}
}
tone_alarm_usage();
exit(0);
return 0;
}
......@@ -456,7 +456,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) {
PX4_ERR("already started");
exit(1);
return 1;
}
if (g_dev == nullptr) {
......@@ -464,34 +464,34 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1);
return 1;
}
if (OK != g_dev->init()) {
delete g_dev;
g_dev = nullptr;
PX4_ERR("ToneAlarm init failed");
exit(1);
return 1;
}
}
exit(0);
return 0;
}
if (!strcmp(argv1, "stop")) {
delete g_dev;
g_dev = nullptr;
exit(0);
return 0;
}
if (!strcmp(argv1, "status")) {
g_dev->status();
exit(0);
return 0;
}
}
tone_alarm_usage();
exit(0);
return 0;
}
#endif /* TONE_ALARM_CHANNEL */
......@@ -546,7 +546,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) {
PX4_ERR("already started");
exit(1);
return 1;
}
if (g_dev == nullptr) {
......@@ -554,33 +554,33 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1);
return 1;
}
if (OK != g_dev->init()) {
delete g_dev;
g_dev = nullptr;
PX4_ERR("ToneAlarm init failed");
exit(1);
return 1;
}
}
exit(0);
return 0;
}
if (!strcmp(argv1, "stop")) {
delete g_dev;
g_dev = nullptr;
exit(0);
return 0;
}
if (!strcmp(argv1, "status")) {
g_dev->status();
exit(0);
return 0;
}
}
tone_alarm_usage();
exit(0);
return 0;
}
......@@ -326,7 +326,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) {
PX4_ERR("already started");
exit(1);
return 1;
}
if (g_dev == nullptr) {
......@@ -334,33 +334,33 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1);
return 1;
}
if (OK != g_dev->init()) {
delete g_dev;
g_dev = nullptr;
PX4_ERR("ToneAlarm init failed");
exit(1);
return 1;
}
}
exit(0);
return 0;
}
if (!strcmp(argv1, "stop")) {
delete g_dev;
g_dev = nullptr;
exit(0);
return 0;
}
if (!strcmp(argv1, "status")) {
g_dev->status();
exit(0);
return 0;
}
}
tone_alarm_usage();
exit(0);
return 0;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment