From d2a40e5f9e17c32f081b7d6ffe719cf82407ba51 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Mon, 4 Nov 2024 16:30:38 +0100 Subject: init und cleanup Funktionen umbenannt --- src/publish.c | 16 ++++++++++------ src/subscribe.c | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/publish.c b/src/publish.c index cc19502..98cab76 100644 --- a/src/publish.c +++ b/src/publish.c @@ -15,6 +15,10 @@ #include "config.h" #include "mqtt.h" +#ifndef MAX_COMMAND_LENGTH +# define MAX_COMMAND_LENGTH 100 +#endif + static bool streq(const char *lhs, const char *rhs) { @@ -22,22 +26,22 @@ streq(const char *lhs, const char *rhs) } static void -cleanup_app(void) +application_cleanup(void) { mosquitto_lib_cleanup(); } static void -init_app(void) +application_init(void) { mosquitto_lib_init(); - (void) atexit(cleanup_app); + (void) atexit(application_cleanup); } int main(void) { - init_app(); + application_init(); struct mosquitto *client = mqtt_connect( NULL, @@ -55,7 +59,7 @@ main(void) for ( bool quit = false; !quit; ) { printf("> "); - char command[100] = { 0 }; // NOLINT + char command[MAX_COMMAND_LENGTH]; if ( fgets(command, sizeof command, stdin) == NULL ) { quit = true; continue; @@ -72,7 +76,7 @@ main(void) } else if ( streq(command, "send") ) { static const char payload[] = "ich bin ein payload"; - static const char topic[] = "testtopic"; + static const char topic[] = "testtopic"; int err = mosquitto_publish( client, diff --git a/src/subscribe.c b/src/subscribe.c index abe862b..3d8611e 100644 --- a/src/subscribe.c +++ b/src/subscribe.c @@ -29,19 +29,19 @@ signal_handler(int signal) } static void -cleanup_app(void) +application_cleanup(void) { mosquitto_lib_cleanup(); } static void -init_app(void) +application_init(void) { terminate = false; (void) signal(SIGINT, signal_handler); mosquitto_lib_init(); - (void) atexit(cleanup_app); + (void) atexit(application_cleanup); } static void @@ -57,7 +57,7 @@ callback(struct mosquitto *client, void *userdata, const struct mosquitto_messag int main(void) { - init_app(); + application_init(); struct mosquitto *client = mqtt_connect( CLIENTID, -- cgit v1.3