summaryrefslogtreecommitdiffstats
path: root/tools/omfwd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-29 15:36:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-29 15:36:22 +0200
commit055d4ffc2afc77e03a3d31720d4a0998f8c3d92c (patch)
treebab872b075c24ba84f6658b5e339759af188591d /tools/omfwd.c
parent1cce2e35b06b54469dd627454c0f58818ff3523a (diff)
downloadrsyslog-055d4ffc2afc77e03a3d31720d4a0998f8c3d92c.tar.gz
rsyslog-055d4ffc2afc77e03a3d31720d4a0998f8c3d92c.tar.xz
rsyslog-055d4ffc2afc77e03a3d31720d4a0998f8c3d92c.zip
fixed problem with module unload sequence
Diffstat (limited to 'tools/omfwd.c')
-rw-r--r--tools/omfwd.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 46c4d0c8..60cacf9c 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -408,12 +408,9 @@ static rsRetVal
loadTCPSupport(void)
{
DEFiRet;
- if(!netstrms.ifIsLoaded)
- CHKiRet(objUse(netstrms, LM_NETSTRMS_FILENAME));
- if(!netstrm.ifIsLoaded)
- CHKiRet(objUse(netstrm, LM_NETSTRM_FILENAME));
- if(!tcpclt.ifIsLoaded)
- CHKiRet(objUse(tcpclt, LM_TCPCLT_FILENAME));
+ CHKiRet(objUse(netstrms, LM_NETSTRMS_FILENAME));
+ CHKiRet(objUse(netstrm, LM_NETSTRMS_FILENAME));
+ CHKiRet(objUse(tcpclt, LM_TCPCLT_FILENAME));
finalize_it:
RETiRet;
@@ -579,12 +576,9 @@ CODESTARTmodExit
objRelease(errmsg, CORE_COMPONENT);
objRelease(glbl, CORE_COMPONENT);
objRelease(net, LM_NET_FILENAME);
- if(netstrm.ifIsLoaded)
- objRelease(netstrm, LM_NETSTRM_FILENAME);
- if(netstrms.ifIsLoaded)
- objRelease(netstrms, LM_NETSTRMS_FILENAME);
- if(!tcpclt.ifIsLoaded)
- objRelease(tcpclt, LM_TCPCLT_FILENAME);
+ objRelease(netstrm, LM_NETSTRMS_FILENAME);
+ objRelease(netstrms, LM_NETSTRMS_FILENAME);
+ objRelease(tcpclt, LM_TCPCLT_FILENAME);
if(pszTplName != NULL) {
free(pszTplName);