From 60917238c37af3adf7f8bd46221de393c034b0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 20 Mar 2019 18:44:36 +0200
Subject: [PATCH] Format config.cc and config_runtime.cc

---
 server/core/config.cc         | 29 +++++++++++++++--------------
 server/core/config_runtime.cc |  8 ++++----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/server/core/config.cc b/server/core/config.cc
index 8bf33b61d..b25367433 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -1932,14 +1932,14 @@ uint64_t MXS_CONFIG_PARAMETER::get_size(const std::string& key) const
     return intval;
 }
 
-std::chrono::milliseconds
-MXS_CONFIG_PARAMETER::get_duration(const std::string& key,
-                                   mxs::config::DurationInterpretation interpretation) const
+std::chrono::milliseconds MXS_CONFIG_PARAMETER::get_duration(const std::string& key,
+                                                             mxs::config::DurationInterpretation interpretation)
+const
 {
     string value = get_string(key);
-    std::chrono::milliseconds duration { 0 };
+    std::chrono::milliseconds duration {0};
     MXB_AT_DEBUG(bool rval = ) get_suffixed_duration(value.c_str(), interpretation, &duration);
-    mxb_assert(rval); // When this function is called, the validity of the value should have been checked.
+    mxb_assert(rval);   // When this function is called, the validity of the value should have been checked.
     return duration;
 }
 
@@ -2015,9 +2015,8 @@ char* MXS_CONFIG_PARAMETER::get_c_str_copy(const string& key) const
     return rval;
 }
 
-std::unique_ptr<pcre2_code>
-MXS_CONFIG_PARAMETER::get_compiled_regex(const string& key, uint32_t options,
-                                         uint32_t* output_ovec_size) const
+std::unique_ptr<pcre2_code> MXS_CONFIG_PARAMETER::get_compiled_regex(const string& key, uint32_t options,
+                                                                     uint32_t* output_ovec_size) const
 {
     auto regex_string = get_string(key);
     std::unique_ptr<pcre2_code> code;
@@ -2032,9 +2031,11 @@ MXS_CONFIG_PARAMETER::get_compiled_regex(const string& key, uint32_t options,
     return code;
 }
 
-std::vector<std::unique_ptr<pcre2_code>>
-MXS_CONFIG_PARAMETER::get_compiled_regexes(const std::vector<string>& keys, uint32_t options,
-                                           uint32_t* ovec_size_out, bool* compile_error_out)
+std::vector<std::unique_ptr<pcre2_code>> MXS_CONFIG_PARAMETER::get_compiled_regexes(
+    const std::vector<string>& keys,
+    uint32_t options,
+    uint32_t* ovec_size_out,
+    bool* compile_error_out)
 {
     std::vector<std::unique_ptr<pcre2_code>> rval;
     bool compile_error = false;
@@ -3008,7 +3009,7 @@ void config_set_global_defaults()
  * @return True if at least one of the required parameters is missing
  */
 static bool missing_required_parameters(const MXS_MODULE_PARAM* mod_params,
-                                        const MXS_CONFIG_PARAMETER&   params,
+                                        const MXS_CONFIG_PARAMETER& params,
                                         const char* name)
 {
     bool rval = false;
@@ -5017,7 +5018,7 @@ bool get_suffixed_duration(const char* zValue,
 
     default:
         break;
-    };
+    }
 
     if (*zEnd == 0)
     {
@@ -5124,7 +5125,7 @@ std::string generate_config_string(const std::string& instance_name, const MXS_C
                                    const MXS_MODULE_PARAM* common_param_defs,
                                    const MXS_MODULE_PARAM* module_param_defs)
 {
-    string output = "[" + instance_name + "]\n";;
+    string output = "[" + instance_name + "]\n";
     // Common params and module params are null-terminated arrays. Loop over both and print parameter
     // names and values.
     for (auto param_set : {common_param_defs, module_param_defs})
diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc
index d7f0f197c..972f06f51 100644
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@@ -108,8 +108,8 @@ static const MXS_MODULE_PARAM* get_type_parameters(const char* type)
  * @return Whether loading succeeded and the list of default parameters
  */
 static std::pair<bool, MXS_CONFIG_PARAMETER> load_defaults(const char* name,
-                                                            const char* module_type,
-                                                            const char* object_type)
+                                                           const char* module_type,
+                                                           const char* object_type)
 {
     bool rval;
     MXS_CONFIG_PARAMETER params;
@@ -306,7 +306,7 @@ bool runtime_create_server(const char* name,
                            const char* port,
                            const char* protocol,
                            const char* authenticator,
-                           bool        external)
+                           bool external)
 {
     std::lock_guard<std::mutex> guard(crt_lock);
     bool rval = false;
@@ -698,7 +698,7 @@ bool do_alter_monitor(Monitor* monitor, const char* key, const char* value)
     {
         // Configure failed, restore original configs. This should not fail.
         // TODO: add a flag to monitor which prevents startup if config is wrong.
-        MXB_AT_DEBUG(bool check =) monitor->configure(&originals);
+        MXB_AT_DEBUG(bool check = ) monitor->configure(&originals);
         mxb_assert(check);
     }
     return success;