Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

fix tone_alarm: avoid using exit()

Browse Source 
On POSIX it exits the process.
This commit is contained in:
Beat Küng
2018-08-31 10:24:39 +02:00
parent 9246110161
commit fe502ffd33
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/kinetis/tone_alarm/tone_alarm.cpp
+7 -7
View File
@@ -460,7 +460,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) { if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) { if (g_dev != nullptr) {
PX4_ERR("already started"); PX4_ERR("already started");
exit(1); return 1;
} }
if (g_dev == nullptr) { if (g_dev == nullptr) {
@@ -468,33 +468,33 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) { if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver"); PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1); return 1;
} }
if (OK != g_dev->init()) { if (OK != g_dev->init()) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
PX4_ERR("ToneAlarm init failed"); PX4_ERR("ToneAlarm init failed");
exit(1); return 1;
} }
} }
exit(0); return 0;
} }
if (!strcmp(argv1, "stop")) { if (!strcmp(argv1, "stop")) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
exit(0); return 0;
} }
if (!strcmp(argv1, "status")) { if (!strcmp(argv1, "status")) {
g_dev->status(); g_dev->status();
exit(0); return 0;
} }
} }
tone_alarm_usage(); tone_alarm_usage();
exit(0); return 0;
} }
src/drivers/samv7/tone_alarm/tone_alarm.cpp
+7 -7
View File
@@ -456,7 +456,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) { if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) { if (g_dev != nullptr) {
PX4_ERR("already started"); PX4_ERR("already started");
exit(1); return 1;
} }
if (g_dev == nullptr) { if (g_dev == nullptr) {
@@ -464,34 +464,34 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) { if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver"); PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1); return 1;
} }
if (OK != g_dev->init()) { if (OK != g_dev->init()) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
PX4_ERR("ToneAlarm init failed"); PX4_ERR("ToneAlarm init failed");
exit(1); return 1;
} }
} }
exit(0); return 0;
} }
if (!strcmp(argv1, "stop")) { if (!strcmp(argv1, "stop")) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
exit(0); return 0;
} }
if (!strcmp(argv1, "status")) { if (!strcmp(argv1, "status")) {
g_dev->status(); g_dev->status();
exit(0); return 0;
} }
} }
tone_alarm_usage(); tone_alarm_usage();
exit(0); return 0;
} }
#endif /* TONE_ALARM_CHANNEL */ #endif /* TONE_ALARM_CHANNEL */
src/drivers/stm32/tone_alarm/tone_alarm.cpp
+7 -7
View File
@@ -546,7 +546,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) { if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) { if (g_dev != nullptr) {
PX4_ERR("already started"); PX4_ERR("already started");
exit(1); return 1;
} }
if (g_dev == nullptr) { if (g_dev == nullptr) {
@@ -554,33 +554,33 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) { if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver"); PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1); return 1;
} }
if (OK != g_dev->init()) { if (OK != g_dev->init()) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
PX4_ERR("ToneAlarm init failed"); PX4_ERR("ToneAlarm init failed");
exit(1); return 1;
} }
} }
exit(0); return 0;
} }
if (!strcmp(argv1, "stop")) { if (!strcmp(argv1, "stop")) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
exit(0); return 0;
} }
if (!strcmp(argv1, "status")) { if (!strcmp(argv1, "status")) {
g_dev->status(); g_dev->status();
exit(0); return 0;
} }
} }
tone_alarm_usage(); tone_alarm_usage();
exit(0); return 0;
} }
src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp
+7 -7
View File
@@ -326,7 +326,7 @@ int tone_alarm_main(int argc, char *argv[])
if (!strcmp(argv1, "start")) { if (!strcmp(argv1, "start")) {
if (g_dev != nullptr) { if (g_dev != nullptr) {
PX4_ERR("already started"); PX4_ERR("already started");
exit(1); return 1;
} }
if (g_dev == nullptr) { if (g_dev == nullptr) {
@@ -334,33 +334,33 @@ int tone_alarm_main(int argc, char *argv[])
if (g_dev == nullptr) { if (g_dev == nullptr) {
PX4_ERR("couldn't allocate the ToneAlarm driver"); PX4_ERR("couldn't allocate the ToneAlarm driver");
exit(1); return 1;
} }
if (OK != g_dev->init()) { if (OK != g_dev->init()) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
PX4_ERR("ToneAlarm init failed"); PX4_ERR("ToneAlarm init failed");
exit(1); return 1;
} }
} }
exit(0); return 0;
} }
if (!strcmp(argv1, "stop")) { if (!strcmp(argv1, "stop")) {
delete g_dev; delete g_dev;
g_dev = nullptr; g_dev = nullptr;
exit(0); return 0;
} }
if (!strcmp(argv1, "status")) { if (!strcmp(argv1, "status")) {
g_dev->status(); g_dev->status();
exit(0); return 0;
} }
} }
tone_alarm_usage(); tone_alarm_usage();
exit(0); return 0;
} }