diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-24 15:55:23 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-24 15:55:23 +0000 |
| commit | 23fb1f062bc993bdce30f643b905105fd2f1b78e (patch) | |
| tree | 2df579fd1601694bb05049623e4864a1202afe75 /include | |
| parent | 4f50b9dfb1ca58cdceaad7578b48aa1ced186008 (diff) | |
Rollback complete! Everyone please go through the code and check i havent forgotten to incorporate your tweaks and changes.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9019 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configreader.h b/include/configreader.h index d8fa3b418..f4563529a 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -230,11 +230,11 @@ class CoreExport ServerConfig : public Extensible * configutation, appending errors to errorstream * and setting error if an error has occured. */ - bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only); + bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream); /** Process an include directive */ - bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only); + bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); /** Check that there is only one of each configuration item */ @@ -658,7 +658,7 @@ class CoreExport ServerConfig : public Extensible * and initialize this class. All other methods * should be used only by the core. */ - void Read(bool bail, User* user, int pass); + void Read(bool bail, User* user); /** Read a file into a file_cache object */ @@ -675,12 +675,12 @@ class CoreExport ServerConfig : public Extensible /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. */ - bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only); + bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream); /** Load 'filename' into 'target', with the new config parser everything is parsed into * tag/key/value at load-time rather than at read-value time. */ - bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only = NULL); + bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream); /* Both these return true if the value existed or false otherwise */ |