Merge pull request #1546 from eeff/v2.6

Pick to v2.6 chore: remove compiler warning
This commit is contained in:
fengzeroz
2023-09-21 10:54:06 +08:00
committed by GitHub
2 changed files with 5 additions and 9 deletions
+4 -8
View File
@@ -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));
}
+1 -1
View File
@@ -885,9 +885,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;
}