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

Cleanup server.h

Browse Source 
- All (but the printing/debug functions) are now in snake_case.
- Functions made const correct.
- All function prototypes now have named arguments.

Documentation still to be moved, and file possibly split into
include/mascale/server.h and server/core/maxscale/server.h
This commit is contained in:
Johan Wikman
2017-01-09 11:19:09 +02:00
parent 1b8742781b
commit c3ddc3ac22
7 changed files with 52 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/galeramon/galeramon.c
View File

@ -595,7 +595,7 @@ static MONITOR_SERVERS *get_candidate_master(MONITOR* mon)
long min_id = -1;
int minval = INT_MAX;
int currval;
char* value;
const char* value;
/* set min_id to the lowest value of moitor_servers->server->node_id */
while (moitor_servers)
{
@ -604,7 +604,7 @@ static MONITOR_SERVERS *get_candidate_master(MONITOR* mon)
moitor_servers->server->depth = 0;
if (handle->use_priority && (value = serverGetParameter(moitor_servers->server, "priority")) != NULL)
if (handle->use_priority && (value = server_get_parameter(moitor_servers->server, "priority")) != NULL)
{
/** The server has a priority */
if ((currval = atoi(value)) > 0)
@ -620,7 +620,7 @@ static MONITOR_SERVERS *get_candidate_master(MONITOR* mon)
else if (moitor_servers->server->node_id >= 0 &&
(!handle->use_priority || /** Server priority disabled*/
candidate_master == NULL || /** No candidate chosen */
serverGetParameter(candidate_master->server, "priority") == NULL)) /** Candidate has no priority */
server_get_parameter(candidate_master->server, "priority") == NULL)) /** Candidate has no priority */
{
if (min_id < 0 || moitor_servers->server->node_id < min_id)
{