From 335cd306bdc7b6bc4df7ec64664f463b3e86b42e Mon Sep 17 00:00:00 2001 From: Puya Daravi Date: Thu, 25 Nov 2021 01:42:32 -0800 Subject: [PATCH] Rename requires to requirements --- components/libminchassis/mysql_component.cc | 2 +- include/mysql/components/services/dynamic_loader.h | 2 +- router/src/harness/src/loader.cc | 4 ++-- router/src/plugin_info/src/plugin.cc | 2 +- router/src/plugin_info/src/plugin.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/libminchassis/mysql_component.cc b/components/libminchassis/mysql_component.cc index 7b8a6956..0dd33a70 100644 --- a/components/libminchassis/mysql_component.cc +++ b/components/libminchassis/mysql_component.cc @@ -83,7 +83,7 @@ std::vector mysql_component::get_required_services() const { std::vector res; for (mysql_service_placeholder_ref_t *implementation_it = - m_component_data->requires; + m_component_data->requirements; implementation_it->name != nullptr; ++implementation_it) { res.push_back(implementation_it); } diff --git a/include/mysql/components/services/dynamic_loader.h b/include/mysql/components/services/dynamic_loader.h index 9517ef9e..8ac0046a 100644 --- a/include/mysql/components/services/dynamic_loader.h +++ b/include/mysql/components/services/dynamic_loader.h @@ -263,7 +263,7 @@ struct mysql_component_t { #endif const char *name; struct mysql_service_ref_t *provides; - struct mysql_service_placeholder_ref_t *requires; + struct mysql_service_placeholder_ref_t *requirements; struct mysql_metadata_ref_t *metadata; mysql_service_status_t (*init)(); mysql_service_status_t (*deinit)(); diff --git a/router/src/harness/src/loader.cc b/router/src/harness/src/loader.cc index 1507bedb..a0bc64f5 100644 --- a/router/src/harness/src/loader.cc +++ b/router/src/harness/src/loader.cc @@ -641,7 +641,7 @@ const Plugin *Loader::load_from(const std::string &plugin_name, // the user might have added these by accident (for example, he // assumed that the array was NULL-terminated) and they can safely // be ignored instead of raising an error. - for (auto req : make_range(plugin->requires, plugin->requires_length)) { + for (auto req : make_range(plugin->requirements, plugin->requires_length)) { if (req != nullptr) { // Parse the designator to extract the plugin and constraints. Designator designator(req); @@ -1333,7 +1333,7 @@ bool Loader::visit(const std::string &designator, (*status)[info.plugin] = Status::ONGOING; if (const Plugin *plugin = plugins_.at(info.plugin).plugin()) { for (auto required : - make_range(plugin->requires, plugin->requires_length)) { + make_range(plugin->requirements, plugin->requires_length)) { assert(required != nullptr); bool succeeded = visit(required, status, order); if (!succeeded) return false; diff --git a/router/src/plugin_info/src/plugin.cc b/router/src/plugin_info/src/plugin.cc index c0ebbf2b..d2f172c3 100644 --- a/router/src/plugin_info/src/plugin.cc +++ b/router/src/plugin_info/src/plugin.cc @@ -39,7 +39,7 @@ Plugin_info::Plugin_info(const Plugin_v1 &plugin) arch_descriptor(plugin.arch_descriptor ? plugin.arch_descriptor : ""), brief(plugin.brief ? plugin.brief : ""), plugin_version(plugin.plugin_version) { - copy_to_list(requires, plugin.requires, plugin.requires_length); + copy_to_list(requires, plugin.requirements, plugin.requires_length); copy_to_list(conflicts, plugin.conflicts, plugin.conflicts_length); } diff --git a/router/src/plugin_info/src/plugin.h b/router/src/plugin_info/src/plugin.h index c67ac89a..8cae96bd 100644 --- a/router/src/plugin_info/src/plugin.h +++ b/router/src/plugin_info/src/plugin.h @@ -56,7 +56,7 @@ struct Plugin_v1 { uint32_t plugin_version; size_t requires_length; - const char **requires; + const char **requirements; size_t conflicts_length; const char **conflicts; -- 2.27.0