diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-06 10:25:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-06 10:25:42 +0200 |
| commit | 9e0af15a324cca5bd50ec3226c64ca9ddb2e8d40 (patch) | |
| tree | d6db3c3908fcada54d916fd680c669ff0e4f36c0 /runtime/obj.c | |
| parent | 4ec4f4ddae4285adf0a40618360ec5cea02d85c3 (diff) | |
| parent | fcbead3d4cbda4c79bb7110e65c85afad4131cb8 (diff) | |
| download | rsyslog-9e0af15a324cca5bd50ec3226c64ca9ddb2e8d40.tar.gz rsyslog-9e0af15a324cca5bd50ec3226c64ca9ddb2e8d40.tar.xz rsyslog-9e0af15a324cca5bd50ec3226c64ca9ddb2e8d40.zip | |
Merge branch 'tls'
Diffstat (limited to 'runtime/obj.c')
| -rw-r--r-- | runtime/obj.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/obj.c b/runtime/obj.c index 18a4a726..312ed223 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -1192,15 +1192,14 @@ ReleaseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) objInfo_t *pObjInfo; - dbgprintf("source file %s requests object '%s', ifIsLoaded %d\n", srcFile, pObjName, pIf->ifIsLoaded); + dbgprintf("source file %s releasing object '%s', ifIsLoaded %d\n", srcFile, pObjName, pIf->ifIsLoaded); if(pObjFile == NULL) FINALIZE; /* if it is not a lodable module, we do not need to do anything... */ if(pIf->ifIsLoaded == 0) { ABORT_FINALIZE(RS_RET_OK); /* we are not loaded - this is perfectly OK... */ - } - if(pIf->ifIsLoaded == 2) { + } else if(pIf->ifIsLoaded == 2) { pIf->ifIsLoaded = 0; /* clean up */ ABORT_FINALIZE(RS_RET_OK); /* we had a load error and can not continue */ } @@ -1209,7 +1208,6 @@ ReleaseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) CHKiRet(FindObjInfo(pStr, &pObjInfo)); /* if we reach this point, we have a valid pObjInfo */ - //if(pObjInfo->pModInfo != NULL) { /* NULL means core module */ module.Release(srcFile, &pObjInfo->pModInfo); /* decrease refcount */ pIf->ifIsLoaded = 0; /* indicated "no longer valid" */ |