From 4665b16ab3556235ddcbdac160df261ee87694e4 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 2 Nov 2016 20:26:52 -0700 Subject: Add checks for fields in CONTROL file. Resolves #228 --- toolsrc/include/SourceParagraph.h | 5 ++++- toolsrc/include/vcpkglib_helpers.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h index 72dca8324..a8ad13668 100644 --- a/toolsrc/include/SourceParagraph.h +++ b/toolsrc/include/SourceParagraph.h @@ -7,14 +7,17 @@ namespace vcpkg { struct SourceParagraph { + static const std::vector& get_list_of_valid_entries(); + SourceParagraph(); - explicit SourceParagraph(const std::unordered_map& fields); + explicit SourceParagraph(std::unordered_map fields); std::string name; std::string version; std::string description; std::string maintainer; std::vector depends; + std::unordered_map unparsed_fields; }; } diff --git a/toolsrc/include/vcpkglib_helpers.h b/toolsrc/include/vcpkglib_helpers.h index 72711d63b..05c9e17df 100644 --- a/toolsrc/include/vcpkglib_helpers.h +++ b/toolsrc/include/vcpkglib_helpers.h @@ -5,8 +5,10 @@ namespace vcpkg {namespace details { std::string optional_field(const std::unordered_map& fields, const std::string& fieldname); + std::string remove_optional_field(std::unordered_map* fields, const std::string& fieldname); std::string required_field(const std::unordered_map& fields, const std::string& fieldname); + std::string remove_required_field(std::unordered_map* fields, const std::string& fieldname); std::vector parse_depends(const std::string& depends_string); }} -- cgit v1.2.3