2023-05-10 15:47:34 +08:00
|
|
|
From 97cef5c831be58770f4a298023d358bd225601d4 Mon Sep 17 00:00:00 2001
|
2021-09-30 15:50:35 +08:00
|
|
|
From: lingsheng <lingsheng@huawei.com>
|
2023-05-10 15:47:34 +08:00
|
|
|
Date: Wed, 10 May 2023 15:02:00 +0800
|
2021-09-30 15:50:35 +08:00
|
|
|
Subject: [PATCH] fix usage exit code
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
client/pub_client.c | 4 ++++
|
|
|
|
|
client/rr_client.c | 3 +++
|
|
|
|
|
client/sub_client.c | 4 ++++
|
|
|
|
|
3 files changed, 11 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/client/pub_client.c b/client/pub_client.c
|
2023-05-10 15:47:34 +08:00
|
|
|
index 7822e27..7e2d910 100644
|
2021-09-30 15:50:35 +08:00
|
|
|
--- a/client/pub_client.c
|
|
|
|
|
+++ b/client/pub_client.c
|
2023-05-10 15:47:34 +08:00
|
|
|
@@ -526,6 +526,10 @@ int main(int argc, char *argv[])
|
2021-09-30 15:50:35 +08:00
|
|
|
if(rc == 2){
|
|
|
|
|
/* --help */
|
|
|
|
|
print_usage();
|
|
|
|
|
+ mosquitto_lib_cleanup();
|
|
|
|
|
+ client_config_cleanup(&cfg);
|
|
|
|
|
+ pub_shared_cleanup();
|
|
|
|
|
+ return 0;
|
2023-05-10 15:47:34 +08:00
|
|
|
}else if(rc == 3){
|
|
|
|
|
print_version();
|
2021-09-30 15:50:35 +08:00
|
|
|
}else{
|
|
|
|
|
diff --git a/client/rr_client.c b/client/rr_client.c
|
2023-05-10 15:47:34 +08:00
|
|
|
index e74536f..fc90803 100644
|
2021-09-30 15:50:35 +08:00
|
|
|
--- a/client/rr_client.c
|
|
|
|
|
+++ b/client/rr_client.c
|
2023-05-10 15:47:34 +08:00
|
|
|
@@ -316,6 +316,9 @@ int main(int argc, char *argv[])
|
2021-09-30 15:50:35 +08:00
|
|
|
if(rc == 2){
|
|
|
|
|
/* --help */
|
|
|
|
|
print_usage();
|
|
|
|
|
+ mosquitto_lib_cleanup();
|
|
|
|
|
+ client_config_cleanup(&cfg);
|
|
|
|
|
+ return 0;
|
2023-05-10 15:47:34 +08:00
|
|
|
}else if(rc == 3){
|
|
|
|
|
/* --version */
|
|
|
|
|
print_version();
|
2021-09-30 15:50:35 +08:00
|
|
|
diff --git a/client/sub_client.c b/client/sub_client.c
|
2023-05-10 15:47:34 +08:00
|
|
|
index 4ff3bf9..80f778f 100644
|
2021-09-30 15:50:35 +08:00
|
|
|
--- a/client/sub_client.c
|
|
|
|
|
+++ b/client/sub_client.c
|
2023-05-10 15:47:34 +08:00
|
|
|
@@ -331,6 +331,10 @@ int main(int argc, char *argv[])
|
2021-09-30 15:50:35 +08:00
|
|
|
if(rc == 2){
|
|
|
|
|
/* --help */
|
|
|
|
|
print_usage();
|
2023-05-10 15:47:34 +08:00
|
|
|
+ mosquitto_destroy(g_mosq);
|
2021-09-30 15:50:35 +08:00
|
|
|
+ mosquitto_lib_cleanup();
|
|
|
|
|
+ client_config_cleanup(&cfg);
|
|
|
|
|
+ return 0;
|
2023-05-10 15:47:34 +08:00
|
|
|
}else if(rc == 3){
|
|
|
|
|
/* --version */
|
|
|
|
|
print_version();
|
2021-09-30 15:50:35 +08:00
|
|
|
--
|
2023-05-10 15:47:34 +08:00
|
|
|
2.33.0
|
2021-09-30 15:50:35 +08:00
|
|
|
|