summaryrefslogtreecommitdiffstats
path: root/plugins/imklog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-02 12:40:48 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-02 12:40:48 +0200
commitbad4228f846d18bd721266931efbbf0b21375a92 (patch)
tree8d1a94582c8a16463f63bcb1f7be0c8db6174d07 /plugins/imklog
parent434e404a6c7181a2b7efa9840506e8963665bdd6 (diff)
parent2493915cfedae899e66dbb3a2f139bf386fac5e1 (diff)
downloadrsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.gz
rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.xz
rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.zip
Merge branch 'beta'
Conflicts: plugins/imklog/linux.c runtime/cfsysline.c runtime/ctok.c runtime/linkedlist.c runtime/sysvar.c
Diffstat (limited to 'plugins/imklog')
-rw-r--r--plugins/imklog/ksym.c3
-rw-r--r--plugins/imklog/ksym_mod.c1
-rw-r--r--plugins/imklog/linux.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/plugins/imklog/ksym.c b/plugins/imklog/ksym.c
index 34ce909e..f636a7bb 100644
--- a/plugins/imklog/ksym.c
+++ b/plugins/imklog/ksym.c
@@ -202,8 +202,7 @@ extern int InitKsyms(char *mapfile)
}
- /*
- * Read the kernel symbol table file and add entries for each
+ /* Read the kernel symbol table file and add entries for each
* line. I suspect that the use of fscanf is not really in vogue
* but it was quick and dirty and IMHO suitable for fixed format
* data such as this. If anybody doesn't agree with this please
diff --git a/plugins/imklog/ksym_mod.c b/plugins/imklog/ksym_mod.c
index bef810b4..6e48e89e 100644
--- a/plugins/imklog/ksym_mod.c
+++ b/plugins/imklog/ksym_mod.c
@@ -163,7 +163,6 @@ extern int InitMsyms(void)
else
imklogLogIntMsg(LOG_ERR, "Error loading kernel symbols " \
"- %s\n", strerror(errno));
- fclose(ksyms);
return(0);
}
diff --git a/plugins/imklog/linux.c b/plugins/imklog/linux.c
index 8e4d3388..853c8b2c 100644
--- a/plugins/imklog/linux.c
+++ b/plugins/imklog/linux.c
@@ -229,8 +229,8 @@ static void LogLine(char *ptr, int len)
*/
*line = 0; /* force null terminator */
- dbgprintf("Line buffer full:\n");
- dbgprintf("\tLine: %s\n", line);
+ //dbgprintf("Line buffer full:\n");
+ //dbgprintf("\tLine: %s\n", line);
Syslog(LOG_INFO, line_buff);
line = line_buff;