1 files changed, 16 insertions, 12 deletions

diff --git a/src/main.c b/src/main.c
index 5bef36b..82e7606 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,6 +7,9 @@
 // System
 #include <unistd.h>
 
+// Mosquitto
+#include <mosquitto.h>
+
 // Project
 #include "config.h"
 #include "mqtt.h"
@@ -15,10 +18,10 @@
 #       define UNUSED(x) (void) (x)
 #endif
 
-static volatile bool terminate = false; // NOLINT
+static volatile bool terminate; // NOLINT
 
 static void
-handler(int signal)
+signal_handler(int signal)
 {
         if ( signal == SIGINT ) {
                 terminate = true;
@@ -26,18 +29,19 @@ handler(int signal)
 }
 
 static void
-cleanup(void)
+cleanup_app(void)
 {
         mosquitto_lib_cleanup();
 }
 
 static void
-init(void)
+init_app(void)
 {
-        (void) signal(SIGINT, handler);
+        terminate = false;
+        (void) signal(SIGINT, signal_handler);
 
         mosquitto_lib_init();
-        (void) atexit(cleanup);
+        (void) atexit(cleanup_app);
 }
 
 static void
@@ -53,13 +57,13 @@ callback(struct mosquitto *client, void *userdata, const struct mosquitto_messag
 int
 main(void)
 {
-        init();
+        init_app();
 
-        struct mosquitto *client = connect(
-            CLIENT_ID,
+        struct mosquitto *client = mqtt_connect(
+            CLIENTID,
             USERNAME,
             PASSWORD,
-            HOST,
+            HOSTNAME,
             PORT,
             callback,
             NULL);
@@ -68,9 +72,9 @@ main(void)
                 return EXIT_FAILURE;
         }
 
-        run(client, (const char *[]){ TOPIC, NULL }, &terminate);
+        mqtt_run(client, (const char *[]){ TOPIC, NULL }, &terminate);
 
-        shutdown(client);
+        mqtt_shutdown(client);
 
         return EXIT_SUCCESS;
 }