rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 22:40:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6-devel'

Browse Source 
Conflicts:
	template.c
This commit is contained in:
Rainer Gerhards 2012-10-11 09:41:53 +02:00
commit 98a94a68b6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/debug.c
View File

@ -927,12 +927,12 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg)
pszObjName = obj.GetName(pObj);
}
// pthread_mutex_lock(&mutdbgprint);
// pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint);
pthread_mutex_lock(&mutdbgprint);
pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint);
do_dbgprint(pszObjName, pszMsg, lenMsg);
// pthread_cleanup_pop(1);
pthread_cleanup_pop(1);
}
#pragma GCC diagnostic warning "-Wempty-body"

5
template.c
View File

@ -320,10 +320,6 @@ tplToJSON(struct template *pTpl, msg_t *pMsg, struct json_object **pjson)
rsRetVal localRet;
DEFiRet;
assert(pTpl != NULL);
assert(pMsg != NULL);
assert(json != NULL);
if(pTpl->subtree != NULL){
localRet = jsonFind(pMsg, pTpl->subtree, pjson);
if(*pjson == NULL) {
@ -1847,6 +1843,7 @@ tplProcessCnf(struct cnfobj *o)
pTpl->optFormatEscape = JSON_ESCAPE;
finalize_it:
free(tplStr);
if(pvals != NULL)
cnfparamvalsDestruct(pvals, &pblk);
if(iRet != RS_RET_OK) {

1
tools/omfile.c
View File

@ -824,6 +824,7 @@ ENDcreateInstance
BEGINfreeInstance
CODESTARTfreeInstance
free(pData->tplName);
free(pData->f_fname);
if(pData->bDynamicName) {
dynaFileFreeCache(pData);