* FIX [exchange] Fix some code warning

Signed-off-by: Moi Ran <maoyi.ran@emqx.io>
nanomq · Nov 28, 2023 · 3023082 · 3023082
1 parent 32dbb1d
commit 3023082
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/mqtt/protocol/exchange/exchange.c b/src/mqtt/protocol/exchange/exchange.c
@@ -34,7 +34,7 @@ exchange_init(exchange_t **ex, char *name, char *topic,
 		return -1;
 	}
 	for (unsigned int i = 0; i < rbsCount; i++) {
-		if (rbsCaps[i] == NULL || rbsCaps[i] >= RINGBUFFER_MAX_SIZE) {
+		if (rbsCaps[i] >= RINGBUFFER_MAX_SIZE) {
 			return -1;
 		}
 	}

diff --git a/src/mqtt/protocol/exchange/exchange_client_test.c b/src/mqtt/protocol/exchange/exchange_client_test.c
@@ -13,6 +13,7 @@ client_publish(nng_socket sock, const char *topic, uint8_t *payload,
 {
 	int rv;
 
+	UNUSED(verbose);
 	// create a PUBLISH message
 	nng_msg *pubmsg;
 	nng_mqtt_msg_alloc(&pubmsg, 0);

diff --git a/src/mqtt/protocol/exchange/exchange_test.c b/src/mqtt/protocol/exchange/exchange_test.c
@@ -23,7 +23,7 @@ void test_exchange_init(void)
 {
 	exchange_t *ex = NULL;
 	char **ringBufferName;
-	int caps = 10000;
+	unsigned int caps = 10000;
 
 	ringBufferName = nng_alloc(1 * sizeof(char *));
 	for (int i = 0; i < 1; i++) {
@@ -41,9 +41,9 @@ void test_exchange_init(void)
 	NUTS_TRUE(exchange_release(ex) == 0);
 
 	for (int i = 0; i < 1; i++) {
-		nng_free(ringBufferName[i], *ringBufferName[i]);
+		nng_free(ringBufferName[i], sizeof(*ringBufferName[i]));
 	}
-	nng_free(ringBufferName, strlen(ringBufferName));
+	nng_free(ringBufferName, sizeof(*ringBufferName));
 
 	return;
 }
@@ -59,7 +59,7 @@ void test_exchange_ringBuffer(void)
 {
 	exchange_t *ex = NULL;
 	char **ringBufferName;
-	int caps = 1;
+	unsigned int caps = 1;
 
 	ringBufferName = nng_alloc(1 * sizeof(char *));
 	for (int i = 0; i < 1; i++) {
@@ -78,7 +78,7 @@ void test_exchange_ringBuffer(void)
 	nng_free(ringBufferName, sizeof(ringBufferName));
 
 	nng_msg *msg = NULL;
-	msg = alloc_pub_msg(&topic);
+	msg = alloc_pub_msg((char *)&topic);
 	NUTS_TRUE(msg != NULL);
 
 	NUTS_TRUE(exchange_handle_msg(ex, (void *)msg) == 0);