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

Remove unnecessary comparison.

Browse Source 
It makes no sense to compare an unsigned integer for non-negativeness;
it won't ever be. router_instance.lastEventReceived is uint8_t.
On centos5 this causes a warning that thus ends the compilation.
This commit is contained in:
Johan Wikman
2015-12-08 13:28:11 +02:00
parent edb3f3efd5
commit 1deea7f929
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

@ -1096,12 +1096,11 @@ struct tm tm;
if (!router_inst->mariadb10_compat) { if (!router_inst->mariadb10_compat) {
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];
} else { } else {
/* Check MariaDB 10 new events */ /* Check MariaDB 10 new events */
@ -1983,13 +1982,11 @@ blr_last_event_description(ROUTER_INSTANCE *router) {
char *event_desc = NULL; char *event_desc = NULL;
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];
} else { } else {
/* Check MariaDB 10 new events */ /* Check MariaDB 10 new events */
@ -2015,13 +2012,11 @@ blr_get_event_description(ROUTER_INSTANCE *router, uint8_t event) {
char *event_desc = NULL; char *event_desc = NULL;
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];
} else { } else {
/* Check MariaDB 10 new events */ /* Check MariaDB 10 new events */