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

Remove unnecessary comparisons

Browse Source 
An unsigned integer type is always >= 0. Thus, making that
comparison is meaningless. Om RHEL5 it causes a warning that
terminates the compilation.
This commit is contained in:
Johan Wikman
2016-04-25 15:28:20 +03:00
parent d1a52cda72
commit 06a5774ee4
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/modules/routing/binlog/blr.c
View File

@ -1160,14 +1160,13 @@ diagnostics(ROUTER *router, DCB *dcb)
{ {
dcb_printf(dcb, "\tLast event from master: 0x%x, %s\n", dcb_printf(dcb, "\tLast event from master: 0x%x, %s\n",
router_inst->lastEventReceived, router_inst->lastEventReceived,
(router_inst->lastEventReceived >= 0 && (router_inst->lastEventReceived <= MAX_EVENT_TYPE) ?
router_inst->lastEventReceived <= MAX_EVENT_TYPE) ?
event_names[router_inst->lastEventReceived] : "unknown"); event_names[router_inst->lastEventReceived] : "unknown");
} }
else else
{ {
char *ptr = NULL; char *ptr = NULL;
if (router_inst->lastEventReceived >= 0 && router_inst->lastEventReceived <= MAX_EVENT_TYPE) if (router_inst->lastEventReceived <= MAX_EVENT_TYPE)
{ {
ptr = event_names[router_inst->lastEventReceived]; ptr = event_names[router_inst->lastEventReceived];
} }
@ -2175,16 +2174,14 @@ blr_last_event_description(ROUTER_INSTANCE *router)
if (!router->mariadb10_compat) if (!router->mariadb10_compat)
{ {
if (router->lastEventReceived >= 0 && if (router->lastEventReceived <= MAX_EVENT_TYPE)
router->lastEventReceived <= MAX_EVENT_TYPE)
{ {
event_desc = event_names[router->lastEventReceived]; event_desc = event_names[router->lastEventReceived];
} }
} }
else else
{ {
if (router->lastEventReceived >= 0 && if (router->lastEventReceived <= MAX_EVENT_TYPE)
router->lastEventReceived <= MAX_EVENT_TYPE)
{ {
event_desc = event_names[router->lastEventReceived]; event_desc = event_names[router->lastEventReceived];
} }
@ -2216,16 +2213,14 @@ blr_get_event_description(ROUTER_INSTANCE *router, uint8_t event)
if (!router->mariadb10_compat) if (!router->mariadb10_compat)
{ {
if (event >= 0 && if (event <= MAX_EVENT_TYPE)
event <= MAX_EVENT_TYPE)
{ {
event_desc = event_names[event]; event_desc = event_names[event];
} }
} }
else else
{ {
if (event >= 0 && if (event <= MAX_EVENT_TYPE)
event <= MAX_EVENT_TYPE)
{ {
event_desc = event_names[event]; event_desc = event_names[event];
} }