diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/mod-build-configs.cxx | 2 | ||||
| -rw-r--r-- | mod/mod-build-force.cxx | 6 | ||||
| -rw-r--r-- | mod/mod-build-log.cxx | 4 | ||||
| -rw-r--r-- | mod/mod-build-result.cxx | 6 | ||||
| -rw-r--r-- | mod/mod-build-task.cxx | 5 | ||||
| -rw-r--r-- | mod/mod-builds.cxx | 6 | ||||
| -rw-r--r-- | mod/mod-package-version-details.cxx | 6 | ||||
| -rw-r--r-- | mod/options.cli | 8 |
8 files changed, 18 insertions, 25 deletions
diff --git a/mod/mod-build-configs.cxx b/mod/mod-build-configs.cxx index 6533c5b..0218a5f 100644 --- a/mod/mod-build-configs.cxx +++ b/mod/mod-build-configs.cxx @@ -39,7 +39,7 @@ init (scanner& s) s, unknown_mode::fail, unknown_mode::fail); if (options_->build_config_specified ()) - build_config_module::init (static_cast<options::build> (*options_)); + build_config_module::init (*options_); } bool brep::build_configs:: diff --git a/mod/mod-build-force.cxx b/mod/mod-build-force.cxx index 2c6ac64..72c5fdf 100644 --- a/mod/mod-build-force.cxx +++ b/mod/mod-build-force.cxx @@ -43,10 +43,8 @@ init (scanner& s) if (options_->build_config_specified ()) { - database_module::init (static_cast<options::build_db> (*options_), - options_->build_db_retry ()); - - build_config_module::init (static_cast<options::build> (*options_)); + database_module::init (*options_, options_->build_db_retry ()); + build_config_module::init (*options_); } } diff --git a/mod/mod-build-log.cxx b/mod/mod-build-log.cxx index c61ad92..a6e6730 100644 --- a/mod/mod-build-log.cxx +++ b/mod/mod-build-log.cxx @@ -45,9 +45,7 @@ init (scanner& s) if (options_->build_config_specified ()) { - database_module::init (static_cast<options::build_db> (*options_), - options_->build_db_retry ()); - + database_module::init (*options_, options_->build_db_retry ()); build_config_module::init (*options_); } diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx index 18dc146..860a964 100644 --- a/mod/mod-build-result.cxx +++ b/mod/mod-build-result.cxx @@ -52,15 +52,15 @@ init (scanner& s) options_ = make_shared<options::build_result> ( s, unknown_mode::fail, unknown_mode::fail); - database_module::init (static_cast<options::package_db> (*options_), + database_module::init (static_cast<const options::package_db&> (*options_), options_->package_db_retry ()); if (options_->build_config_specified ()) { - database_module::init (static_cast<options::build_db> (*options_), + database_module::init (static_cast<const options::build_db&> (*options_), options_->build_db_retry ()); - build_config_module::init (static_cast<options::build> (*options_)); + build_config_module::init (*options_); } if (options_->root ().empty ()) diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx index 27f884e..ec94e89 100644 --- a/mod/mod-build-task.cxx +++ b/mod/mod-build-task.cxx @@ -60,8 +60,7 @@ init (scanner& s) if (options_->build_config_specified ()) { - database_module::init (static_cast<options::build_db> (*options_), - options_->build_db_retry ()); + database_module::init (*options_, options_->build_db_retry ()); // Check that the database 'build' schema matches the current one. It's // enough to perform the check in just a single module implementation @@ -73,7 +72,7 @@ init (scanner& s) fail << "database 'build' schema differs from the current one (module " << BREP_VERSION_ID << ")"; - build_config_module::init (static_cast<options::build> (*options_)); + build_config_module::init (*options_); } if (options_->root ().empty ()) diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx index d7bebd0..ffb192b 100644 --- a/mod/mod-builds.cxx +++ b/mod/mod-builds.cxx @@ -58,10 +58,8 @@ init (scanner& s) if (options_->build_config_specified ()) { - database_module::init (static_cast<options::build_db> (*options_), - options_->build_db_retry ()); - - build_config_module::init (static_cast<options::build> (*options_)); + database_module::init (*options_, options_->build_db_retry ()); + build_config_module::init (*options_); } if (options_->root ().empty ()) diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx index 81f18b1..8680f00 100644 --- a/mod/mod-package-version-details.cxx +++ b/mod/mod-package-version-details.cxx @@ -47,15 +47,15 @@ init (scanner& s) options_ = make_shared<options::package_version_details> ( s, unknown_mode::fail, unknown_mode::fail); - database_module::init (static_cast<options::package_db> (*options_), + database_module::init (static_cast<const options::package_db&> (*options_), options_->package_db_retry ()); if (options_->build_config_specified ()) { - database_module::init (static_cast<options::build_db> (*options_), + database_module::init (static_cast<const options::build_db&> (*options_), options_->build_db_retry ()); - build_config_module::init (static_cast<options::build> (*options_)); + build_config_module::init (*options_); } if (options_->root ().empty ()) diff --git a/mod/options.cli b/mod/options.cli index 00b88db..4004e79 100644 --- a/mod/options.cli +++ b/mod/options.cli @@ -344,7 +344,7 @@ namespace brep { }; - class build_task: build, package_db, build_db, handler + class build_task: build, build_db, handler { size_t build-task-request-max-size = 102400 { @@ -375,15 +375,15 @@ namespace brep } }; - class build_log: build, package_db, build_db, handler + class build_log: build, build_db, handler { }; - class build_force: build, package_db, build_db, handler + class build_force: build, build_db, handler { }; - class builds: build, package_db, build_db, page, handler + class builds: build, build_db, page, handler { uint16_t build-page-entries = 20 { |