summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/Makefile.am4
-rw-r--r--runtime/cfsysline.c2
-rw-r--r--runtime/legacyconf.c (renamed from runtime/conf.c)4
-rw-r--r--runtime/legacyconf.h (renamed from runtime/conf.h)2
-rw-r--r--runtime/rsyslog.c2
-rw-r--r--runtime/strmsrv.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index c8e8ce2a..a963251c 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -18,8 +18,8 @@ librsyslog_la_SOURCES = \
glbl.h \
glbl.c \
unlimited_select.h \
- conf.c \
- conf.h \
+ legacyconf.c \
+ legacyconf.h \
parser.h \
parser.c \
strgen.h \
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index 97b35bb2..44b26022 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -39,7 +39,7 @@
#include "cfsysline.h"
#include "obj.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "errmsg.h"
#include "srUtils.h"
#include "unicode-helper.h"
diff --git a/runtime/conf.c b/runtime/legacyconf.c
index 1d28a884..fd23bdcd 100644
--- a/runtime/conf.c
+++ b/runtime/legacyconf.c
@@ -1,4 +1,4 @@
-/* The config file handler (not yet a real object)
+/* The legacy config file handler (not yet a real object)
*
* This file is based on an excerpt from syslogd.c, which dates back
* much later. I began the file on 2008-02-19 as part of the modularization
@@ -60,7 +60,7 @@
#include "modules.h"
#include "outchannel.h"
#include "stringbuf.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "stringbuf.h"
#include "srUtils.h"
#include "errmsg.h"
diff --git a/runtime/conf.h b/runtime/legacyconf.h
index bc09d502..2cfd540f 100644
--- a/runtime/conf.h
+++ b/runtime/legacyconf.h
@@ -1,4 +1,4 @@
-/* Definitions for config file handling (not yet an object).
+/* Definitions for the legacy config file handling (not yet an object).
*
* Copyright 2008 Rainer Gerhards and Adiscon GmbH.
*
diff --git a/runtime/rsyslog.c b/runtime/rsyslog.c
index bdb1c9ff..9cf32f22 100644
--- a/runtime/rsyslog.c
+++ b/runtime/rsyslog.c
@@ -74,7 +74,7 @@
#include "vmprg.h"
#include "datetime.h"
#include "queue.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "glbl.h"
#include "errmsg.h"
#include "prop.h"
diff --git a/runtime/strmsrv.c b/runtime/strmsrv.c
index e66ad717..4de58b77 100644
--- a/runtime/strmsrv.c
+++ b/runtime/strmsrv.c
@@ -64,7 +64,7 @@
#include "module-template.h"
#include "net.h"
#include "srUtils.h"
-#include "conf.h"
+#include "legacyconf.h"
#include "strmsrv.h"
#include "obj.h"
#include "glbl.h"