From 2163a6aabefeaaa4d837498d29834ac12920eb33 Mon Sep 17 00:00:00 2001
From: eeff <33566201+eeff@users.noreply.github.com>
Date: Wed, 20 Sep 2023 17:22:51 +0800
Subject: [PATCH] chore: remove compiler warning

---
 src/adapter/driver/cache.c  | 12 ++++--------
 src/adapter/driver/driver.c |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/adapter/driver/cache.c b/src/adapter/driver/cache.c
index ee5ad77e..171fd831 100644
--- a/src/adapter/driver/cache.c
+++ b/src/adapter/driver/cache.c
@@ -321,8 +321,7 @@ int neu_driver_cache_meta_get(neu_driver_cache_t *cache, const char *group,
         }
 
         for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
-            if (elem->metas[i].name != NULL &&
-                strlen(elem->metas[i].name) > 0) {
+            if (strlen(elem->metas[i].name) > 0) {
                 memcpy(&value->metas[i], &elem->metas[i],
                        sizeof(neu_tag_meta_t));
             }
@@ -404,8 +403,7 @@ int neu_driver_cache_meta_get_changed(neu_driver_cache_t *cache,
         }
 
         for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
-            if (elem->metas[i].name != NULL &&
-                strlen(elem->metas[i].name) > 0) {
+            if (strlen(elem->metas[i].name) > 0) {
                 memcpy(&value->metas[i], &elem->metas[i],
                        sizeof(neu_tag_meta_t));
             }
@@ -485,8 +483,7 @@ int neu_driver_cache_get(neu_driver_cache_t *cache, const char *group,
         }
 
         for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
-            if (elem->metas[i].name != NULL &&
-                strlen(elem->metas[i].name) > 0) {
+            if (strlen(elem->metas[i].name) > 0) {
                 memcpy(&value->metas[i], &elem->metas[i],
                        sizeof(neu_tag_meta_t));
             }
@@ -563,8 +560,7 @@ int neu_driver_cache_get_changed(neu_driver_cache_t *cache, const char *group,
         }
 
         for (int i = 0; i < NEU_TAG_META_SIZE; i++) {
-            if (elem->metas[i].name != NULL &&
-                strlen(elem->metas[i].name) > 0) {
+            if (strlen(elem->metas[i].name) > 0) {
                 memcpy(&value->metas[i], &elem->metas[i],
                        sizeof(neu_tag_meta_t));
             }
diff --git a/src/adapter/driver/driver.c b/src/adapter/driver/driver.c
index acd1d77b..7abe1cd9 100644
--- a/src/adapter/driver/driver.c
+++ b/src/adapter/driver/driver.c
@@ -856,9 +856,9 @@ int neu_adapter_driver_del_group(neu_adapter_driver_t *driver, const char *name)
         utarray_free(find->grp.tags);
         utarray_free(find->wt_tags);
         neu_group_destroy(find->group);
+        pthread_mutex_destroy(&find->wt_mtx);
         free(find);
 
-        pthread_mutex_destroy(&find->wt_mtx);
         neu_adapter_del_group_metrics(&driver->adapter, name);
         ret = NEU_ERR_SUCCESS;
     }