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

Removed 'extern' keyword from function declaration in headers. Functions are 'extern' by default.

Browse Source 
Changed mysql_protocol_init prototype and implementation to return MySQLProtocol pointer instead of boolean.
This commit is contained in:
vraatikka
2013-09-01 00:30:46 +03:00
parent 9bf0f58526
commit 88ffcaa3d4
2 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/protocol/mysql_common.c
View File

@ -36,14 +36,16 @@ extern int gw_MySQLWrite_backend(DCB *dcb, GWBUF *queue);
extern int gw_error_backend_event(DCB *dcb);
bool mysql_protocol_init(
MySQLProtocol* mysql_protocol_init(
DCB* dcb)
{
MySQLProtocol* p = NULL;
bool succp = false;
MySQLProtocol* p;
CHK_DCB(dcb);
if (dcb != NULL) {
CHK_DCB(dcb);
}
p = (MySQLProtocol *) calloc(1, sizeof(MySQLProtocol));
if (p == NULL) {
int eno = errno;
errno = 0;
@ -54,16 +56,17 @@ bool mysql_protocol_init(
pthread_self(),
eno,
strerror(eno));
goto return_succp;
goto return_p;
}
p->state = MYSQL_ALLOC;
p->protocol_chk_top = CHK_NUM_PROTOCOL;
p->protocol_chk_tail = CHK_NUM_PROTOCOL;
p->fd = dcb->fd;
p->descriptor = dcb;
dcb->protocol = p;
succp = true;
return_succp:
return succp;
CHK_PROTOCOL(p);
return_p:
return p;
}
#if 0
@ -544,8 +547,6 @@ int gw_do_connect_to_backend(
strerror(eno));
}
}
return_with_dcb:
/**
* Add the dcb in the poll set
*/