diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 17:08:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 17:08:01 +0200 |
| commit | b30e809a202ef42e59a6c9e455e17ce56c7894bc (patch) | |
| tree | 23e0584c2a0cc1fecdd7f2c9af69f7482e7c915b /action.h | |
| parent | b615cbaacec3d6f25e448362095ac54fcbe6d927 (diff) | |
| parent | 945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (diff) | |
| download | rsyslog-b30e809a202ef42e59a6c9e455e17ce56c7894bc.tar.gz rsyslog-b30e809a202ef42e59a6c9e455e17ce56c7894bc.tar.xz rsyslog-b30e809a202ef42e59a6c9e455e17ce56c7894bc.zip | |
Merge branch 'v5-devel'
Conflicts:
configure.ac
doc/manual.html
doc/rsyslog_conf.html
runtime/msg.c
runtime/rsyslog.h
template.c
Diffstat (limited to 'action.h')
| -rw-r--r-- | action.h | 19 |
1 files changed, 1 insertions, 18 deletions
@@ -100,28 +100,11 @@ rsRetVal actionDestruct(action_t *pThis); rsRetVal actionDbgPrint(action_t *pThis); rsRetVal actionSetGlobalResumeInterval(int iNewVal); rsRetVal actionDoAction(action_t *pAction); -rsRetVal actionWriteToAction(action_t *pAction); +rsRetVal actionWriteToAction(action_t *pAction, batch_t *pBatch, int idxBtch); rsRetVal actionCallHUPHdlr(action_t *pAction); rsRetVal actionClassInit(void); rsRetVal addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringRequest_t *pOMSR, int bSuspended); rsRetVal actionNewScope(void); rsRetVal actionRestoreScope(void); -#if 1 -#define actionIsSuspended(pThis) ((pThis)->bSuspended == 1) -#else -/* The function is a debugging aid */ -inline int actionIsSuspended(action_t *pThis) -{ - int i; - ASSERT(pThis != NULL); - i = pThis->bSuspended == 1; - dbgprintf("in IsSuspend(), returns %d\n", i); - return i; -} -#endif - #endif /* #ifndef ACTION_H_INCLUDED */ -/* - * vi:set ai: - */ |