summaryrefslogtreecommitdiffstats
path: root/plugins/omtesting/omtesting.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-20 12:58:48 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-20 12:58:48 +0200
commit0f52727043736b1e411bc60309ed18d41a4f1234 (patch)
tree97fd6c1defe93abc97717c4ae3d598166f7ad402 /plugins/omtesting/omtesting.c
parent7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0 (diff)
parent4a24d8e1b63a27d8c20f2d3d614fcdc2bcb52a01 (diff)
downloadrsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.gz
rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.xz
rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.zip
Merge branch 'beta' into v6-stable
Diffstat (limited to 'plugins/omtesting/omtesting.c')
-rw-r--r--plugins/omtesting/omtesting.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/omtesting/omtesting.c b/plugins/omtesting/omtesting.c
index 139ac8f9..ff290c94 100644
--- a/plugins/omtesting/omtesting.c
+++ b/plugins/omtesting/omtesting.c
@@ -57,6 +57,7 @@
MODULE_TYPE_OUTPUT
MODULE_TYPE_NOKEEP
+MODULE_CNFNAME("omtesting")
/* internal structures
*/
@@ -78,8 +79,7 @@ typedef struct _instanceData {
typedef struct configSettings_s {
int bEchoStdout; /* echo non-failed messages to stdout */
} configSettings_t;
-
-SCOPING_SUPPORT; /* must be set AFTER configSettings_t is defined */
+static configSettings_t cs;
BEGINinitConfVars /* (re)set config variables to default values */
CODESTARTinitConfVars
@@ -318,7 +318,7 @@ ENDqueryEtryPt
BEGINmodInit()
CODESTARTmodInit
-SCOPINGmodInit
+INITLegCnfVars
*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
CODEmodInit_QueryRegCFSLineHdlr
CHKiRet(omsdRegCFSLineHdlr((uchar *)"actionomtestingechostdout", 0, eCmdHdlrBinary, NULL,