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

MXS-2011 Declare variables at the point where they are needed

Browse Source 
Also change explicit allocation into vector.
This commit is contained in:
Johan Wikman
2018-08-23 16:50:27 +03:00
parent 883a3a6fe1
commit 2ba0b4dda9
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -33,6 +33,7 @@
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <zlib.h> #include <zlib.h>
#include <vector>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxbase/atomic.h> #include <maxbase/atomic.h>
#include <maxscale/clock.h> #include <maxscale/clock.h>
@ -4239,14 +4240,10 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
char *command, char *command,
char *error) char *error)
{ {
char *master_logfile = NULL;
int change_binlog = 0;
ChangeMasterOptions change_master; ChangeMasterOptions change_master;
int parse_ret;
char *cmd_ptr;
char *cmd_string;
if ((cmd_ptr = strcasestr(command, "TO")) == NULL) char* cmd_ptr = strcasestr(command, "TO");
if (!cmd_ptr)
{ {
static const char MESSAGE[] = "statement doesn't have the CHANGE MASTER TO syntax"; static const char MESSAGE[] = "statement doesn't have the CHANGE MASTER TO syntax";
mxb_assert(sizeof(MESSAGE) <= BINLOG_ERROR_MSG_LEN); mxb_assert(sizeof(MESSAGE) <= BINLOG_ERROR_MSG_LEN);
@ -4254,25 +4251,12 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
return -1; return -1;
} }
if ((cmd_string = MXS_STRDUP(cmd_ptr + 2)) == NULL) std::vector<char> cmd_string(cmd_ptr + 2, cmd_ptr + strlen(cmd_ptr) + 1);
{
static const char MESSAGE[] = "error allocating memory for statement parsing";
mxb_assert(sizeof(MESSAGE) <= BINLOG_ERROR_MSG_LEN);
strcpy(error, MESSAGE);
MXS_ERROR("%s: %s", router->service->name, error);
return -1;
}
/* Parse SQL command and populate the change_master struct */ /* Parse SQL command and populate the change_master struct */
parse_ret = blr_parse_change_master_command(cmd_string, if (blr_parse_change_master_command(&cmd_string.front(),
error, error,
&change_master); &change_master) != 0)
MXS_FREE(cmd_string);
if (parse_ret)
{ {
MXS_ERROR("%s CHANGE MASTER TO parse error: %s", MXS_ERROR("%s CHANGE MASTER TO parse error: %s",
router->service->name, router->service->name,
@ -4413,6 +4397,7 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
* New binlog file could be the next one or current one * New binlog file could be the next one or current one
* or empty if router->mariadb10_master_gtid is set. * or empty if router->mariadb10_master_gtid is set.
*/ */
char *master_logfile = NULL;
if (!blr_binlog_change_check(router, if (!blr_binlog_change_check(router,
change_master, change_master,
error) || error) ||
@ -4440,6 +4425,7 @@ int blr_handle_change_master(ROUTER_INSTANCE* router,
MXS_FREE(master_logfile); MXS_FREE(master_logfile);
int change_binlog = 0;
if (router->master_state == BLRM_UNCONFIGURED) if (router->master_state == BLRM_UNCONFIGURED)
{ {
change_binlog = 1; change_binlog = 1;