hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format core sources again

Browse Source 
Formatted with nl_func_type_name and related options set to ignore. This
keeps the formatting intact for long return types in declarations and
definitions.
This commit is contained in:
Markus Mäkelä
2019-05-09 10:43:09 +03:00
parent 50b5fe76ef
commit b4e8f79c5f
30 changed files with 331 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/internal/config_runtime.hh
View File

@ -60,7 +60,7 @@ bool runtime_create_server(const char* name,
const char* port,
const char* protocol,
const char* authenticator,
bool external = true);
bool external = true);
/**
* @brief Destroy a server

2
server/core/internal/filter.hh
View File

@ -50,7 +50,7 @@ SFilterDef filter_alloc(const char* name, const char* module, MXS_CONFIG_PA
MXS_DOWNSTREAM* filter_apply(const SFilterDef& filter_def, MXS_SESSION* session, MXS_DOWNSTREAM* downstream);
void filter_free(const SFilterDef& filter);
int filter_standard_parameter(const char* name);
MXS_UPSTREAM* filter_upstream(const SFilterDef& filter_def,
MXS_UPSTREAM* filter_upstream(const SFilterDef& filter_def,
MXS_FILTER_SESSION* fsession,
MXS_UPSTREAM* upstream);

36
server/core/internal/monitor.hh
View File

@ -26,23 +26,23 @@ static const MXS_ENUM_VALUE mxs_monitor_event_default_enum = {"all", ~0ULL};
static const MXS_ENUM_VALUE mxs_monitor_event_enum_values[] =
{
mxs_monitor_event_default_enum,
{"master_down", MASTER_DOWN_EVENT},
{"master_up", MASTER_UP_EVENT},
{"slave_down", SLAVE_DOWN_EVENT},
{"slave_up", SLAVE_UP_EVENT},
{"server_down", SERVER_DOWN_EVENT},
{"server_up", SERVER_UP_EVENT},
{"synced_down", SYNCED_DOWN_EVENT},
{"synced_up", SYNCED_UP_EVENT},
{"donor_down", DONOR_DOWN_EVENT},
{"donor_up", DONOR_UP_EVENT},
{"lost_master", LOST_MASTER_EVENT},
{"lost_slave", LOST_SLAVE_EVENT},
{"lost_synced", LOST_SYNCED_EVENT},
{"lost_donor", LOST_DONOR_EVENT},
{"new_master", NEW_MASTER_EVENT},
{"new_slave", NEW_SLAVE_EVENT},
{"new_synced", NEW_SYNCED_EVENT},
{"new_donor", NEW_DONOR_EVENT},
{"master_down", MASTER_DOWN_EVENT },
{"master_up", MASTER_UP_EVENT },
{"slave_down", SLAVE_DOWN_EVENT },
{"slave_up", SLAVE_UP_EVENT },
{"server_down", SERVER_DOWN_EVENT },
{"server_up", SERVER_UP_EVENT },
{"synced_down", SYNCED_DOWN_EVENT },
{"synced_up", SYNCED_UP_EVENT },
{"donor_down", DONOR_DOWN_EVENT },
{"donor_up", DONOR_UP_EVENT },
{"lost_master", LOST_MASTER_EVENT },
{"lost_slave", LOST_SLAVE_EVENT },
{"lost_synced", LOST_SYNCED_EVENT },
{"lost_donor", LOST_DONOR_EVENT },
{"new_master", NEW_MASTER_EVENT },
{"new_slave", NEW_SLAVE_EVENT },
{"new_synced", NEW_SYNCED_EVENT },
{"new_donor", NEW_DONOR_EVENT },
{NULL}
};

4
server/core/internal/monitormanager.hh
View File

@ -150,7 +150,7 @@ class MonitorStop
{
public:
MonitorStop(mxs::Monitor* monitor)
: m_monitor(monitor->state() == MONITOR_STATE_RUNNING ? monitor : nullptr)
: m_monitor(monitor->state() == MONITOR_STATE_RUNNING ? monitor : nullptr)
{
if (m_monitor)
{
@ -168,4 +168,4 @@ public:
private:
mxs::Monitor* m_monitor;
};
};

2
server/core/internal/service.hh
View File

@ -109,7 +109,7 @@ public:
mutable std::mutex lock;
// TODO: Make this private.
mxs::Monitor* m_monitor { nullptr }; /**< A possibly associated monitor */
mxs::Monitor* m_monitor {nullptr}; /**< A possibly associated monitor */
bool uses_cluster() const
{