summaryrefslogtreecommitdiff
path: root/include/configparser.h
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2018-12-09 15:57:42 +0000
committerPeter Powell <petpow@saberuk.com>2018-12-09 16:13:27 +0000
commitcb7e83aa4ed48df3e1bb259b26737feaf5a0d676 (patch)
tree42a86375ac884c707a8a00d925e65a893f9034d0 /include/configparser.h
parentf99f0af6d1f0f2a0106528b778f0fd38d25068cf (diff)
Move some config parser-internal types out of the public header.
Diffstat (limited to 'include/configparser.h')
-rw-r--r--include/configparser.h39
1 files changed, 0 insertions, 39 deletions
diff --git a/include/configparser.h b/include/configparser.h
index c9790c59f..680f11a61 100644
--- a/include/configparser.h
+++ b/include/configparser.h
@@ -19,25 +19,6 @@
#pragma once
-struct fpos
-{
- std::string filename;
- int line;
- int col;
- fpos(const std::string& name, int l = 1, int c = 1) : filename(name), line(l), col(c) {}
- std::string str()
- {
- return filename + ":" + ConvToStr(line) + ":" + ConvToStr(col);
- }
-};
-
-enum ParseFlags
-{
- FLAG_USE_COMPAT = 1,
- FLAG_NO_EXEC = 2,
- FLAG_NO_INC = 4
-};
-
struct ParseStack
{
std::vector<std::string> reading;
@@ -57,23 +38,3 @@ struct ParseStack
void DoInclude(ConfigTag* includeTag, int flags);
void DoReadFile(const std::string& key, const std::string& file, int flags, bool exec);
};
-
-/** RAII wrapper on FILE* to close files on exceptions */
-struct FileWrapper
-{
- FILE* const f;
- bool close_with_pclose;
- FileWrapper(FILE* file, bool use_pclose = false) : f(file), close_with_pclose(use_pclose) {}
- operator bool() { return (f != NULL); }
- operator FILE*() { return f; }
- ~FileWrapper()
- {
- if (f)
- {
- if (close_with_pclose)
- pclose(f);
- else
- fclose(f);
- }
- }
-};