diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-19 08:24:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-19 08:24:25 +0200 |
| commit | bbe1f2688c4bd5cb1b66bb48af1ce5428d69c3b9 (patch) | |
| tree | 08e4f48d250765693153e0ecc13db01cc32e4542 /runtime | |
| parent | e1c34e174139ad030ca1108ff9782b294909013c (diff) | |
| download | rsyslog-bbe1f2688c4bd5cb1b66bb48af1ce5428d69c3b9.tar.gz rsyslog-bbe1f2688c4bd5cb1b66bb48af1ce5428d69c3b9.tar.xz rsyslog-bbe1f2688c4bd5cb1b66bb48af1ce5428d69c3b9.zip | |
renaming conf.* wasn't a good idea -- undoing
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 4 | ||||
| -rw-r--r-- | runtime/cfsysline.c | 2 | ||||
| -rw-r--r-- | runtime/conf.c (renamed from runtime/legacyconf.c) | 4 | ||||
| -rw-r--r-- | runtime/conf.h (renamed from runtime/legacyconf.h) | 2 | ||||
| -rw-r--r-- | runtime/rsyslog.c | 2 | ||||
| -rw-r--r-- | runtime/strmsrv.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index a963251c..c8e8ce2a 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -18,8 +18,8 @@ librsyslog_la_SOURCES = \ glbl.h \ glbl.c \ unlimited_select.h \ - legacyconf.c \ - legacyconf.h \ + conf.c \ + conf.h \ parser.h \ parser.c \ strgen.h \ diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 44b26022..97b35bb2 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -39,7 +39,7 @@ #include "cfsysline.h" #include "obj.h" -#include "legacyconf.h" +#include "conf.h" #include "errmsg.h" #include "srUtils.h" #include "unicode-helper.h" diff --git a/runtime/legacyconf.c b/runtime/conf.c index fd23bdcd..1d28a884 100644 --- a/runtime/legacyconf.c +++ b/runtime/conf.c @@ -1,4 +1,4 @@ -/* The legacy config file handler (not yet a real object) +/* The 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 "legacyconf.h" +#include "conf.h" #include "stringbuf.h" #include "srUtils.h" #include "errmsg.h" diff --git a/runtime/legacyconf.h b/runtime/conf.h index 2cfd540f..bc09d502 100644 --- a/runtime/legacyconf.h +++ b/runtime/conf.h @@ -1,4 +1,4 @@ -/* Definitions for the legacy config file handling (not yet an object). +/* Definitions for 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 9cf32f22..bdb1c9ff 100644 --- a/runtime/rsyslog.c +++ b/runtime/rsyslog.c @@ -74,7 +74,7 @@ #include "vmprg.h" #include "datetime.h" #include "queue.h" -#include "legacyconf.h" +#include "conf.h" #include "glbl.h" #include "errmsg.h" #include "prop.h" diff --git a/runtime/strmsrv.c b/runtime/strmsrv.c index 4de58b77..e66ad717 100644 --- a/runtime/strmsrv.c +++ b/runtime/strmsrv.c @@ -64,7 +64,7 @@ #include "module-template.h" #include "net.h" #include "srUtils.h" -#include "legacyconf.h" +#include "conf.h" #include "strmsrv.h" #include "obj.h" #include "glbl.h" |