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

MXS-1506: Clean up various functions

Browse Source 
Reduced variable scopes and removed unused code.
This commit is contained in:
Markus Mäkelä
2018-04-06 10:36:53 +03:00
parent 23bc8b6db6
commit c8d25f293f
5 changed files with 14 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -59,22 +59,19 @@ using namespace maxscale;
*/
static bool rwsplit_process_router_options(Config& config, char **options)
{
int i;
char *value;
select_criteria_t c;
if (options == NULL)
{
return true;
}
MXS_WARNING("Router options for readwritesplit are deprecated.");
bool success = true;
for (i = 0; options[i]; i++)
for (int i = 0; options[i]; i++)
{
if ((value = strchr(options[i], '=')) == NULL)
char* value = strchr(options[i], '=');
if (value == NULL)
{
MXS_ERROR("Unsupported router option \"%s\" for readwritesplit router.", options[i]);
success = false;
@ -85,7 +82,7 @@ static bool rwsplit_process_router_options(Config& config, char **options)
value++;
if (strcmp(options[i], "slave_selection_criteria") == 0)
{
c = GET_SELECT_CRITERIA(value);
select_criteria_t c = GET_SELECT_CRITERIA(value);
ss_dassert(c == LEAST_GLOBAL_CONNECTIONS ||
c == LEAST_ROUTER_CONNECTIONS || c == LEAST_BEHIND_MASTER ||
c == LEAST_CURRENT_OPERATIONS || c == UNDEFINED_CRITERIA);
@ -155,7 +152,7 @@ static bool rwsplit_process_router_options(Config& config, char **options)
success = false;
}
}
} /*< for */
}
return success;
}