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

Removed unnecessary NULL checks in mysql_client and mysql_common

Browse Source
This commit is contained in:
Markus Makela
2015-06-23 11:53:29 +03:00
parent 3de7798fac
commit 3d7b050f6f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/protocol/mysql_client.c
View File

@ -1771,7 +1771,7 @@ gw_client_close(DCB *dcb)
dcb->state == DCB_STATE_NOPOLLING || dcb->state == DCB_STATE_NOPOLLING ||
dcb->state == DCB_STATE_ZOMBIE) dcb->state == DCB_STATE_ZOMBIE)
{ {
if (!DCB_IS_CLONE(dcb) && protocol) CHK_PROTOCOL(protocol); if (!DCB_IS_CLONE(dcb)) CHK_PROTOCOL(protocol);
} }
#endif #endif
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG, LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,

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

@ -128,10 +128,7 @@ void mysql_protocol_done (
MySQLProtocol* p; MySQLProtocol* p;
server_command_t* scmd; server_command_t* scmd;
server_command_t* scmd2; server_command_t* scmd2;
if(dcb->protocol == NULL)
return;
p = (MySQLProtocol *)dcb->protocol; p = (MySQLProtocol *)dcb->protocol;
spinlock_acquire(&p->protocol_lock); spinlock_acquire(&p->protocol_lock);