From: Jiří Matěják <jiri.matejak@fel.cvut.cz>
Date: Fri, 18 May 2018 09:45:10 +0000 (+0200)
Subject: free and destroy
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/coffee/mt-apps.git/commitdiff_plain/ea09d8979808bb07a91bfd78d1498c9f87e4d863

free and destroy
---

diff --git a/mt_aio.c b/mt_aio.c
index e01de28..a8e981a 100644
--- a/mt_aio.c
+++ b/mt_aio.c
@@ -36,6 +36,7 @@ int main(int argc, char **argv)
     mt_server_deinit(&server);
     mt_keys_deinit(&keys);
     mt_rfid_deinit(&rfid);
+    ev_loop_destroy(loop);
 
     return 0;
 }
diff --git a/mt_gpio.c b/mt_gpio.c
index b6391b1..a10894f 100644
--- a/mt_gpio.c
+++ b/mt_gpio.c
@@ -104,6 +104,7 @@ int main(int argc, char **argv)
     ev_run(loop, 0);
 
     mt_gpio_deinit(&gpio);
+    ev_loop_destroy(loop);
 
     return 0;
 }
diff --git a/mt_keys.c b/mt_keys.c
index d33635a..eae093d 100644
--- a/mt_keys.c
+++ b/mt_keys.c
@@ -139,6 +139,7 @@ int main(int argc, char **argv)
     ev_run(loop, 0);
 
     mt_keys_deinit(&keys);
+    ev_loop_destroy(loop);
 
     return 0;
 }
diff --git a/mt_rfid.c b/mt_rfid.c
index e661337..542c60b 100644
--- a/mt_rfid.c
+++ b/mt_rfid.c
@@ -225,6 +225,7 @@ int main(int argc, char **argv)
     ev_run(loop, 0);
 
     mt_rfid_deinit(&rfid);
+    ev_loop_destroy(loop);
 
     return 0;
 }
diff --git a/mt_server.c b/mt_server.c
index fa099bb..f7315e1 100644
--- a/mt_server.c
+++ b/mt_server.c
@@ -81,6 +81,7 @@ void list_deinit(list *in)
     while (in->first) {
         list_remove(in);
     }
+    free(in);
 }
 
 static const struct lws_http_mount mount = {
@@ -292,7 +293,8 @@ int mt_server_init(mt_server_t *self, struct ev_loop *loop, int fd)
 
 void mt_server_deinit(mt_server_t *self)
 {
-    list_deinit((list *)protocols[PROTOCOL_MERICA_TERMINAL].user);
+    free_line(self->fd_watcher.text);
+    list_deinit(self->fd_watcher.lines);
     lws_context_destroy(self->context);
 }
 
@@ -311,6 +313,7 @@ int main(int argc, const char **argv)
     ev_run(loop, 0);
 
     mt_server_deinit(&server);
+    ev_loop_destroy(loop);
 
     return 0;
 }