From 83b036bc0e428f4872f2a8652d4b93bb3932b38c Mon Sep 17 00:00:00 2001 From: Mark Stemm Date: Wed, 2 Feb 2022 16:05:21 -0800 Subject: [PATCH] Small changes to falco engine/config wrt new cmdline option parsing For the most part, replacing getopt() with cxxopts + falco application had no effect on falco engine/config interfaces. However, there were a few places where it was wasier to change the interface than add middleware code that transformed from, for example, vectors to lists. This commit has those changes. Signed-off-by: Mark Stemm --- userspace/falco/configuration.cpp | 4 ++-- userspace/falco/configuration.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/userspace/falco/configuration.cpp b/userspace/falco/configuration.cpp index 0aab9657..502b9b3c 100644 --- a/userspace/falco/configuration.cpp +++ b/userspace/falco/configuration.cpp @@ -51,7 +51,7 @@ falco_configuration::~falco_configuration() } } -void falco_configuration::init(string conf_filename, list &cmdline_options) +void falco_configuration::init(string conf_filename, const vector &cmdline_options) { string m_config_file = conf_filename; m_config = new yaml_configuration(); @@ -390,7 +390,7 @@ static bool split(const string &str, char delim, pair &parts) return true; } -void falco_configuration::init_cmdline_options(list &cmdline_options) +void falco_configuration::init_cmdline_options(const vector &cmdline_options) { for(const string &option : cmdline_options) { diff --git a/userspace/falco/configuration.h b/userspace/falco/configuration.h index 786e9e8c..a82fd4db 100644 --- a/userspace/falco/configuration.h +++ b/userspace/falco/configuration.h @@ -216,8 +216,8 @@ public: falco_configuration(); virtual ~falco_configuration(); - void init(std::string conf_filename, std::list& cmdline_options); - void init(std::list& cmdline_options); + void init(std::string conf_filename, const std::vector& cmdline_options); + void init(const std::vector& cmdline_options); static void read_rules_file_directory(const string& path, list& rules_filenames); @@ -266,7 +266,7 @@ public: std::vector m_plugins; private: - void init_cmdline_options(std::list& cmdline_options); + void init_cmdline_options(const std::vector& cmdline_options); /** * Given a = specifier, set the appropriate option