diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 12:16:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 12:16:24 +0100 |
| commit | 05eb0a5052c5d679269ef33cfe07bd4394833a63 (patch) | |
| tree | 21f4022b36048af41dd4b7cbc4f164df74426c4c | |
| parent | 98d4437d0e5950118e5dd09fda0bf45e85512bfd (diff) | |
| download | rsyslog-05eb0a5052c5d679269ef33cfe07bd4394833a63.tar.gz rsyslog-05eb0a5052c5d679269ef33cfe07bd4394833a63.tar.bz2 rsyslog-05eb0a5052c5d679269ef33cfe07bd4394833a63.zip | |
silence compiler warnings & some cleanup
| -rw-r--r-- | plugins/mmaudit/mmaudit.c | 6 | ||||
| -rw-r--r-- | runtime/module-template.h | 3 | ||||
| -rw-r--r-- | runtime/queue.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/plugins/mmaudit/mmaudit.c b/plugins/mmaudit/mmaudit.c index 4934312b..018e1771 100644 --- a/plugins/mmaudit/mmaudit.c +++ b/plugins/mmaudit/mmaudit.c @@ -67,12 +67,8 @@ DEFobjCurrIf(errmsg); DEF_OMOD_STATIC_DATA typedef struct _instanceData { -} instanceData; - -typedef struct configSettings_s { int dummy; /* remove when the first real parameter is needed */ -} configSettings_t; -static configSettings_t cs; +} instanceData; BEGINinitConfVars /* (re)set config variables to default values */ CODESTARTinitConfVars diff --git a/runtime/module-template.h b/runtime/module-template.h index 9dd759a5..72a139c4 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -246,7 +246,8 @@ static rsRetVal dbgPrintInstInfo(void *pModData)\ instanceData *pData = NULL; #define CODESTARTdbgPrintInstInfo \ - pData = (instanceData*) pModData; + pData = (instanceData*) pModData; \ + (void)pData; /* prevent compiler warning if unused! */ #define ENDdbgPrintInstInfo \ RETiRet;\ diff --git a/runtime/queue.c b/runtime/queue.c index 0cd33701..fbf77108 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -127,7 +127,7 @@ static struct cnfparamblk pblk = }; /* debug aid */ -static void displayBatchState(batch_t *pBatch) +static inline void displayBatchState(batch_t *pBatch) { int i; for(i = 0 ; i < pBatch->nElem ; ++i) { |