diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
| commit | 2fc70320e303fd02b29469416a709a1f8ee4374d (patch) | |
| tree | 9de5d8b20ad8d6e7a6d85c559056a68a68adff1e /action.h | |
| parent | 33366f2f1e271f47edeed75f69d9885171e61ea0 (diff) | |
| parent | 9e18ecc9bd14093b78199fd36c315cfce4d26a26 (diff) | |
| download | rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.gz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.bz2 rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'action.h')
| -rw-r--r-- | action.h | 19 |
1 files changed, 1 insertions, 18 deletions
@@ -100,26 +100,9 @@ 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); -#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: - */ |