pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

call func_free of annotation

pull/37/head
yuqing 2018-07-06 17:48:50 +08:00
parent 96a57d65ee
commit 6ba4379b1e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ini_file_reader.c
View File

@ -226,7 +226,7 @@ static int iniAnnotationFuncShellExec(IniContext *context, char *param,
logWarning("file: "__FILE__", line: %d, " logWarning("file: "__FILE__", line: %d, "
"empty reply when exec: %s", __LINE__, param); "empty reply when exec: %s", __LINE__, param);
} }
pOutValue[count++] = trim_right(output); pOutValue[count++] = fc_trim(output);
return count; return count;
} }
@ -317,7 +317,6 @@ static int iniAnnotationReplaceVars(IniContext *pContext, char *param,
trim(name); trim(name);
name_len = strlen(name); name_len = strlen(name);
if (name_len > 0) { if (name_len > 0) {
logInfo("name: %s(%d)", name, name_len);
value = (char *)hash_find(set->vars, name, name_len); value = (char *)hash_find(set->vars, name, name_len);
} else { } else {
value = NULL; value = NULL;
@ -972,7 +971,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
if (isAnnotation) if (isAnnotation)
{ {
AnnotationMap *pAnnoMapBase; AnnotationMap *pAnnoMapBase;
AnnotationMap *pAnnoMap; AnnotationMap *pAnnoMap = NULL;
bool found; bool found;
isAnnotation = 0; isAnnotation = 0;
@ -1079,6 +1078,11 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
} }
} }
} }
if (pAnnoMap != NULL && pAnnoMap->func_free != NULL)
{
pAnnoMap->func_free(pItemValues, nItemCnt);
}
continue; continue;
} }