diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c index 69a498beb..78abd9fe8 100644 --- a/server/modules/routing/binlog/blr.c +++ b/server/modules/routing/binlog/blr.c @@ -1160,14 +1160,13 @@ diagnostics(ROUTER *router, DCB *dcb) { dcb_printf(dcb, "\tLast event from master: 0x%x, %s\n", 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"); } else { 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]; } @@ -2175,16 +2174,14 @@ blr_last_event_description(ROUTER_INSTANCE *router) if (!router->mariadb10_compat) { - if (router->lastEventReceived >= 0 && - router->lastEventReceived <= MAX_EVENT_TYPE) + if (router->lastEventReceived <= MAX_EVENT_TYPE) { event_desc = event_names[router->lastEventReceived]; } } else { - if (router->lastEventReceived >= 0 && - router->lastEventReceived <= MAX_EVENT_TYPE) + if (router->lastEventReceived <= MAX_EVENT_TYPE) { 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 (event >= 0 && - event <= MAX_EVENT_TYPE) + if (event <= MAX_EVENT_TYPE) { event_desc = event_names[event]; } } else { - if (event >= 0 && - event <= MAX_EVENT_TYPE) + if (event <= MAX_EVENT_TYPE) { event_desc = event_names[event]; }