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

Added missing brackets

Browse Source 
Some curly braces were missing from readconnroute and some function declarations
were misaligned.
This commit is contained in:
Markus Makela
2015-12-01 15:47:37 +02:00
parent 45abfeec2c
commit 9da0c206bb
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/modules/routing/readconnroute.c
View File

@ -213,7 +213,9 @@ createInstance(SERVICE *service, char **options)
* backend server. * backend server.
*/ */
for (sref = service->dbref, n = 0; sref; sref = sref->next) for (sref = service->dbref, n = 0; sref; sref = sref->next)
{
n++; n++;
}
inst->servers = (BACKEND **) calloc(n + 1, sizeof(BACKEND *)); inst->servers = (BACKEND **) calloc(n + 1, sizeof(BACKEND *));
if (!inst->servers) if (!inst->servers)
@ -613,8 +615,7 @@ newSession(ROUTER *instance, SESSION *session)
* @details (write detailed description here) * @details (write detailed description here)
* *
*/ */
static void freeSession(ROUTER* router_instance, static void freeSession(ROUTER* router_instance, void* router_client_ses)
void* router_client_ses)
{ {
ROUTER_INSTANCE* router = (ROUTER_INSTANCE *) router_instance; ROUTER_INSTANCE* router = (ROUTER_INSTANCE *) router_instance;
ROUTER_CLIENT_SES* router_cli_ses = ROUTER_CLIENT_SES* router_cli_ses =
@ -746,7 +747,10 @@ routeQuery(ROUTER *instance, void *router_session, GWBUF *queue)
"server.%s", "server.%s",
mysql_command, rses_is_closed ? " Session is closed." : ""); mysql_command, rses_is_closed ? " Session is closed." : "");
rc = 0; rc = 0;
while ((queue = GWBUF_CONSUME_ALL(queue)) != NULL); while ((queue = GWBUF_CONSUME_ALL(queue)) != NULL)
{
;
}
goto return_rc; goto return_rc;
} }
@ -841,11 +845,7 @@ diagnostics(ROUTER *router, DCB *dcb)
* @param queue The GWBUF with reply data * @param queue The GWBUF with reply data
*/ */
static void static void
clientReply( clientReply(ROUTER *instance, void *router_session, GWBUF *queue, DCB *backend_dcb)
ROUTER *instance,
void *router_session,
GWBUF *queue,
DCB *backend_dcb)
{ {
ss_dassert(backend_dcb->session->client != NULL); ss_dassert(backend_dcb->session->client != NULL);
SESSION_ROUTE_REPLY(backend_dcb->session, queue); SESSION_ROUTE_REPLY(backend_dcb->session, queue);
@ -864,13 +864,8 @@ clientReply(
* @param succp Result of action: true if router can continue * @param succp Result of action: true if router can continue
* *
*/ */
static void handleError( static void handleError(ROUTER *instance, void *router_session, GWBUF *errbuf,
ROUTER *instance, DCB *problem_dcb, error_action_t action, bool *succp)
void *router_session,
GWBUF *errbuf,
DCB *problem_dcb,
error_action_t action,
bool *succp)
{ {
DCB *client_dcb; DCB *client_dcb;
@ -935,8 +930,7 @@ static void handleError(
* @details (write detailed description here) * @details (write detailed description here)
* *
*/ */
static bool rses_begin_locked_router_action( static bool rses_begin_locked_router_action(ROUTER_CLIENT_SES* rses)
ROUTER_CLIENT_SES* rses)
{ {
bool succp = false; bool succp = false;
@ -973,8 +967,7 @@ return_succp:
* @details (write detailed description here) * @details (write detailed description here)
* *
*/ */
static void rses_end_locked_router_action( static void rses_end_locked_router_action(ROUTER_CLIENT_SES* rses)
ROUTER_CLIENT_SES* rses)
{ {
CHK_CLIENT_RSES(rses); CHK_CLIENT_RSES(rses);
spinlock_release(&rses->rses_lock); spinlock_release(&rses->rses_lock);