diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 14:16:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 14:16:57 +0100 |
| commit | ad0fa5175901ba101a1e06f4a39ae56b75f84dca (patch) | |
| tree | b25b46993ddc5339f5ff39da7a219f664f05deac /runtime/module-template.h | |
| parent | 6624ad434b5e346a84f600845c09739208382f43 (diff) | |
| parent | 1049537cd853c9714c4bdc3fe4296dda8507900d (diff) | |
| download | rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.gz rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.xz rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.zip | |
Merge branch 'v6-stable'
Conflicts:
runtime/conf.c
runtime/modules.c
runtime/modules.h
Diffstat (limited to 'runtime/module-template.h')
| -rw-r--r-- | runtime/module-template.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/runtime/module-template.h b/runtime/module-template.h index a50b1fe9..b98890ae 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -386,14 +386,14 @@ static rsRetVal tryResume(instanceData __attribute__((unused)) *pData)\ static rsRetVal initConfVars(void);\ static configSettings_t cs; /* our current config settings */ \ static configSettings_t cs_save; /* our saved (scope!) config settings */ \ -static rsRetVal newScope(void) \ +static rsRetVal __attribute__((unused)) newScope(void) \ { \ DEFiRet; \ memcpy(&cs_save, &cs, sizeof(cs)); \ iRet = initConfVars(); \ RETiRet; \ } \ -static rsRetVal restoreScope(void) \ +static rsRetVal __attribute__((unused)) restoreScope(void) \ { \ DEFiRet; \ memcpy(&cs, &cs_save, sizeof(cs)); \ @@ -473,10 +473,6 @@ static rsRetVal queryEtryPt(uchar *name, rsRetVal (**pEtryPoint)())\ *pEtryPoint = freeInstance;\ } else if(!strcmp((char*) name, "parseSelectorAct")) {\ *pEtryPoint = parseSelectorAct;\ - } else if(!strcmp((char*) name, "newScope")) {\ - *pEtryPoint = newScope;\ - } else if(!strcmp((char*) name, "restoreScope")) {\ - *pEtryPoint = restoreScope;\ } else if(!strcmp((char*) name, "isCompatibleWithFeature")) {\ *pEtryPoint = isCompatibleWithFeature;\ } else if(!strcmp((char*) name, "tryResume")) {\ |