aboutsummaryrefslogtreecommitdiffstats
path: root/src/nmt
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-03-04 07:12:12 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-03-04 07:12:12 +0100
commit3fc4fc54be56310650a9f7ea1183aa71a3d3ac4d (patch)
tree500dfebbc37eda7b1c2b3184b5df010aa9f13479 /src/nmt
parent4201717f36f1236fd0de1597679f5e9411c8a7eb (diff)
main_common: Move init and cleanup function to main function
Diffstat (limited to 'src/nmt')
-rw-r--r--src/nmt/main.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nmt/main.c b/src/nmt/main.c
index 9aedd3e..89e07c4 100644
--- a/src/nmt/main.c
+++ b/src/nmt/main.c
@@ -348,9 +348,6 @@ int main(int argc, char *argv[])
print_image();
/* init functions */
- rc = init_common(station_id, 7);
- if (rc < 0)
- goto fail;
rc = init_frame();
if (rc < 0) {
fprintf(stderr, "Failed to setup frames. Quitting!\n");
@@ -380,7 +377,7 @@ int main(int argc, char *argv[])
nmt_check_channels();
- main_common(&quit, latency, interval, myhandler);
+ main_common(&quit, latency, interval, myhandler, station_id, 7);
fail:
/* fifo */
@@ -388,9 +385,6 @@ fail:
close(sms_deliver_fd);
unlink(SMS_DELIVER);
- /* cleanup functions */
- cleanup_common();
-
/* destroy transceiver instance */
while (sender_head)
nmt_destroy(sender_head);