X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigparser.h;h=c9790c59f7d22ccb22527b620b7933463f3e6698;hb=7851faac62d7a83c94cd5d37e0109b5d0a152bf9;hp=9b2cd4527db963c8481922344b96054e8051cea7;hpb=f16d82607c5f26d9b7892b93dbad1aaf44f2c601;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configparser.h b/include/configparser.h index 9b2cd4527..c9790c59f 100644 --- a/include/configparser.h +++ b/include/configparser.h @@ -17,6 +17,8 @@ */ +#pragma once + struct fpos { std::string filename; @@ -39,7 +41,7 @@ enum ParseFlags struct ParseStack { std::vector reading; - std::map vars; + insp::flat_map vars; ConfigDataHash& output; ConfigFileCache& FilesOutput; std::stringstream& errstr; @@ -51,8 +53,7 @@ struct ParseStack vars["quot"] = "\""; vars["newline"] = vars["nl"] = "\n"; } - bool ParseFile(const std::string& name, int flags, const std::string& mandatory_tag = ""); - bool ParseExec(const std::string& name, int flags, const std::string& mandatory_tag = ""); + bool ParseFile(const std::string& name, int flags, const std::string& mandatory_tag = std::string(), bool isexec = false); void DoInclude(ConfigTag* includeTag, int flags); void DoReadFile(const std::string& key, const std::string& file, int flags, bool exec); }; @@ -76,5 +77,3 @@ struct FileWrapper } } }; - -