summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-29 12:47:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-29 12:47:13 +0200
commit99e4bbc0e4bbb6235ccdc7482bb1329880add9c1 (patch)
treeadb9690bec8c2fb4b42ebebe0adf9c7ec4facee2
parent6812fceef4f955610e6075c798f729e7a0617b24 (diff)
downloadrsyslog-99e4bbc0e4bbb6235ccdc7482bb1329880add9c1.tar.gz
rsyslog-99e4bbc0e4bbb6235ccdc7482bb1329880add9c1.tar.xz
rsyslog-99e4bbc0e4bbb6235ccdc7482bb1329880add9c1.zip
imklog: cleanup of no longer used code
-rw-r--r--plugins/imklog/imklog.c16
-rw-r--r--plugins/imklog/imklog.h16
2 files changed, 0 insertions, 32 deletions
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c
index 6a607a74..f476c5ff 100644
--- a/plugins/imklog/imklog.c
+++ b/plugins/imklog/imklog.c
@@ -82,7 +82,6 @@ typedef struct configSettings_s {
int iFacilIntMsg; /* the facility to use for internal messages (set by driver) */
uchar *pszPath;
int console_log_level;
- char *symfile; /* TODO: actually unsued currently! */
} configSettings_t;
static configSettings_t cs;
@@ -104,7 +103,6 @@ initConfigSettings(void)
cs.bPermitNonKernel = 0;
cs.console_log_level = -1;
cs.pszPath = NULL;
- cs.symfile = NULL;
cs.iFacilIntMsg = klogFacilIntMsg();
}
@@ -300,21 +298,8 @@ CODESTARTendCnfLoad
loadModConf->pszPath = cs.pszPath;
}
cs.pszPath = NULL;
- if((cs.symfile == NULL) || (cs.symfile[0] == '\0')) {
- loadModConf->symfile = NULL;
- if(cs.symfile != NULL)
- free(cs.symfile);
- } else {
- loadModConf->symfile = cs.symfile;
- }
- cs.symfile = NULL;
loadModConf = NULL; /* done loading */
- /* free legacy config vars */
- free(cs.pszPath);
- cs.pszPath = NULL;
- free(cs.symfile);
- cs.symfile = NULL;
ENDendCnfLoad
@@ -378,7 +363,6 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
cs.dbgPrintSymbols = 0;
cs.symbols_twice = 0;
cs.use_syscall = 0;
- cs.symfile = NULL;
cs.symbol_lookup = 0;
cs.bPermitNonKernel = 0;
if(cs.pszPath != NULL) {
diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h
index 7f6c810a..795dd68c 100644
--- a/plugins/imklog/imklog.h
+++ b/plugins/imklog/imklog.h
@@ -39,7 +39,6 @@ struct modConfData_s {
int iFacilIntMsg;
uchar *pszPath;
int console_log_level;
- char *symfile;
rsconf_t *pConf;
};
@@ -54,21 +53,6 @@ rsRetVal klogWillRun(modConfData_t *pModConf);
rsRetVal klogAfterRun(modConfData_t *pModConf);
int klogFacilIntMsg();
-/* the following data members may be accessed by the "drivers"
- * I admit this is not the cleanest way to doing things, but I honestly
- * believe it is appropriate for the job that needs to be done.
- * rgerhards, 2008-04-09
- */
-#if 0
-extern int symbols_twice;
-extern int use_syscall;
-extern int symbol_lookup;
-extern char *symfile;
-extern int console_log_level;
-extern int dbgPrintSymbols;
-extern uchar *pszPath;
-#endif
-
/* the functions below may be called by the drivers */
rsRetVal imklogLogIntMsg(int priority, char *fmt, ...) __attribute__((format(printf,2, 3)));
rsRetVal Syslog(int priority, uchar *msg, struct timeval *tp);