diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-04 08:34:31 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-04 08:34:31 +0000 |
| commit | f5250a3a92ec4c1738556f3cc5139dbc15579add (patch) | |
| tree | 796ab385480e9d1cb7079c4c3b90378b0e254466 /obj.c | |
| parent | 54751c7e6e374c130d6d6d5cee5db493f7919fef (diff) | |
| download | rsyslog-f5250a3a92ec4c1738556f3cc5139dbc15579add.tar.gz rsyslog-f5250a3a92ec4c1738556f3cc5139dbc15579add.tar.xz rsyslog-f5250a3a92ec4c1738556f3cc5139dbc15579add.zip | |
changed command line processing. -v, -M, -c options are now parsed and
processed before all other options. Inter-option dependencies have been
relieved. Among others, permits to specify intial module load path via
-M only (not the environment) which makes it much easier to work with
non-standard module library locations. Thanks to varmojfekoj for
suggesting this change. Matches bugzilla bug 55.
Diffstat (limited to 'obj.c')
| -rw-r--r-- | obj.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1073,7 +1073,7 @@ RegisterObj(uchar *pszObjName, objInfo_t *pInfo) if(i >= OBJ_NUM_IDS) ABORT_FINALIZE(RS_RET_OBJ_REGISTRY_OUT_OF_SPACE); arrObjInfo[i] = pInfo; - dbgprintf("object '%s' successfully registered with index %d, qIF %p\n", pszObjName, i, pInfo->QueryIF); + /* DEV debug only: dbgprintf("object '%s' successfully registered with index %d, qIF %p\n", pszObjName, i, pInfo->QueryIF); */ finalize_it: if(iRet != RS_RET_OK) { @@ -1113,7 +1113,7 @@ UnregisterObj(uchar *pszObjName, objInfo_t *pInfo) ABORT_FINALIZE(RS_RET_OBJ_NOT_REGISTERED); InfoDestruct(&arrObjInfo[i]); - dbgprintf("object '%s' successfully unregistered with index %d\n", pszObjName, i); + /* DEV debug only: dbgprintf("object '%s' successfully unregistered with index %d\n", pszObjName, i); */ finalize_it: if(iRet != RS_RET_OK) { @@ -1137,7 +1137,7 @@ UseObj(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); + /* DEV debug only: dbgprintf("source file %s requests object '%s', ifIsLoaded %d\n", srcFile, pObjName, pIf->ifIsLoaded); */ if(pIf->ifIsLoaded == 1) { ABORT_FINALIZE(RS_RET_OK); /* we are already set */ @@ -1170,7 +1170,6 @@ UseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) } /* if we reach this point, we have a valid pObjInfo */ - //if(pObjInfo->pModInfo != NULL) { /* NULL means core module */ if(pObjFile != NULL) { /* NULL means core module */ module.Use(srcFile, pObjInfo->pModInfo); /* increase refcount */ } |