diff options
| author | Thomas Schmucker <ts@its1.de> | 2024-11-04 16:30:38 +0100 |
|---|---|---|
| committer | Thomas Schmucker <ts@its1.de> | 2024-11-04 16:30:38 +0100 |
| commit | d2a40e5f9e17c32f081b7d6ffe719cf82407ba51 (patch) | |
| tree | 652256198360ecbdf14834e51c487044a8ca9dbf | |
| parent | 47e04a5292a8868ca9c7063aba0e82a9c0f1f755 (diff) | |
| download | use-mosquitto-d2a40e5f9e17c32f081b7d6ffe719cf82407ba51.tar.gz use-mosquitto-d2a40e5f9e17c32f081b7d6ffe719cf82407ba51.tar.bz2 use-mosquitto-d2a40e5f9e17c32f081b7d6ffe719cf82407ba51.zip | |
init und cleanup Funktionen umbenannt
| -rw-r--r-- | src/publish.c | 16 | ||||
| -rw-r--r-- | 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 @@ | |||
| 15 | #include "config.h" | 15 | #include "config.h" |
| 16 | #include "mqtt.h" | 16 | #include "mqtt.h" |
| 17 | 17 | ||
| 18 | #ifndef MAX_COMMAND_LENGTH | ||
| 19 | # define MAX_COMMAND_LENGTH 100 | ||
| 20 | #endif | ||
| 21 | |||
| 18 | static bool | 22 | static bool |
| 19 | streq(const char *lhs, const char *rhs) | 23 | streq(const char *lhs, const char *rhs) |
| 20 | { | 24 | { |
| @@ -22,22 +26,22 @@ streq(const char *lhs, const char *rhs) | |||
| 22 | } | 26 | } |
| 23 | 27 | ||
| 24 | static void | 28 | static void |
| 25 | cleanup_app(void) | 29 | application_cleanup(void) |
| 26 | { | 30 | { |
| 27 | mosquitto_lib_cleanup(); | 31 | mosquitto_lib_cleanup(); |
| 28 | } | 32 | } |
| 29 | 33 | ||
| 30 | static void | 34 | static void |
| 31 | init_app(void) | 35 | application_init(void) |
| 32 | { | 36 | { |
| 33 | mosquitto_lib_init(); | 37 | mosquitto_lib_init(); |
| 34 | (void) atexit(cleanup_app); | 38 | (void) atexit(application_cleanup); |
| 35 | } | 39 | } |
| 36 | 40 | ||
| 37 | int | 41 | int |
| 38 | main(void) | 42 | main(void) |
| 39 | { | 43 | { |
| 40 | init_app(); | 44 | application_init(); |
| 41 | 45 | ||
| 42 | struct mosquitto *client = mqtt_connect( | 46 | struct mosquitto *client = mqtt_connect( |
| 43 | NULL, | 47 | NULL, |
| @@ -55,7 +59,7 @@ main(void) | |||
| 55 | for ( bool quit = false; !quit; ) { | 59 | for ( bool quit = false; !quit; ) { |
| 56 | printf("> "); | 60 | printf("> "); |
| 57 | 61 | ||
| 58 | char command[100] = { 0 }; // NOLINT | 62 | char command[MAX_COMMAND_LENGTH]; |
| 59 | if ( fgets(command, sizeof command, stdin) == NULL ) { | 63 | if ( fgets(command, sizeof command, stdin) == NULL ) { |
| 60 | quit = true; | 64 | quit = true; |
| 61 | continue; | 65 | continue; |
| @@ -72,7 +76,7 @@ main(void) | |||
| 72 | } | 76 | } |
| 73 | else if ( streq(command, "send") ) { | 77 | else if ( streq(command, "send") ) { |
| 74 | static const char payload[] = "ich bin ein payload"; | 78 | static const char payload[] = "ich bin ein payload"; |
| 75 | static const char topic[] = "testtopic"; | 79 | static const char topic[] = "testtopic"; |
| 76 | 80 | ||
| 77 | int err = mosquitto_publish( | 81 | int err = mosquitto_publish( |
| 78 | client, | 82 | 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) | |||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | static void | 31 | static void |
| 32 | cleanup_app(void) | 32 | application_cleanup(void) |
| 33 | { | 33 | { |
| 34 | mosquitto_lib_cleanup(); | 34 | mosquitto_lib_cleanup(); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | static void | 37 | static void |
| 38 | init_app(void) | 38 | application_init(void) |
| 39 | { | 39 | { |
| 40 | terminate = false; | 40 | terminate = false; |
| 41 | (void) signal(SIGINT, signal_handler); | 41 | (void) signal(SIGINT, signal_handler); |
| 42 | 42 | ||
| 43 | mosquitto_lib_init(); | 43 | mosquitto_lib_init(); |
| 44 | (void) atexit(cleanup_app); | 44 | (void) atexit(application_cleanup); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | static void | 47 | static void |
| @@ -57,7 +57,7 @@ callback(struct mosquitto *client, void *userdata, const struct mosquitto_messag | |||
| 57 | int | 57 | int |
| 58 | main(void) | 58 | main(void) |
| 59 | { | 59 | { |
| 60 | init_app(); | 60 | application_init(); |
| 61 | 61 | ||
| 62 | struct mosquitto *client = mqtt_connect( | 62 | struct mosquitto *client = mqtt_connect( |
| 63 | CLIENTID, | 63 | CLIENTID, |
