From 5a7c4b00e2fd9a28afdf58d77e9b752cbf2f87a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 19 Nov 2018 11:51:50 +0200 Subject: [PATCH] Fixing various compiler warnings --- lib/MySQL_HostGroups_Manager.cpp | 2 +- lib/MySQL_Session.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index 29502eefe..756a0d8c0 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -4533,7 +4533,7 @@ class MySQL_Errors_stats { sprintf(buf,"%d",err_no); pta[6]=strdup(buf); - sprintf(buf,"%u",count_star); + sprintf(buf,"%llu",count_star); pta[7]=strdup(buf); time_t __now; diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index 7ff7e8c30..313ee547a 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -588,29 +588,30 @@ bool MySQL_Session::handler_CommitRollback(PtrSize_t *pkt) { // FIXME: This function is currently disabled . See #469 bool MySQL_Session::handler_SetAutocommit(PtrSize_t *pkt) { size_t sal=strlen("set autocommit"); + char *ptr = (char *)pkt->ptr; if ( pkt->size >= 7+sal) { if (strncasecmp((char *)"SET @@session.autocommit",(char *)pkt->ptr+5,strlen((char *)"SET @@session.autocommit"))==0) { - memmove(pkt->ptr+9, pkt->ptr+19, pkt->size - 19); - memset(pkt->ptr+pkt->size-10,' ',10); + memmove(ptr+9, ptr+19, pkt->size - 19); + memset(ptr + pkt->size-10,' ',10); } if (strncasecmp((char *)"set autocommit",(char *)pkt->ptr+5,sal)==0) { void *p = NULL; - for (int i=5+sal; isize; i++) { + for (int i=5+sal; i < (int)pkt->size; i++) { *((char *)pkt->ptr+i) = tolower(*((char *)pkt->ptr+i)); } - p = memmem(pkt->ptr+5+sal, pkt->size-5-sal, (void *)"false", 5); + p = memmem(ptr+5+sal, pkt->size-5-sal, (void *)"false", 5); if (p) { memcpy(p,(void *)"0 ",5); } - p = memmem(pkt->ptr+5+sal, pkt->size-5-sal, (void *)"true", 4); + p = memmem(ptr+5+sal, pkt->size-5-sal, (void *)"true", 4); if (p) { memcpy(p,(void *)"1 ",4); } - p = memmem(pkt->ptr+5+sal, pkt->size-5-sal, (void *)"off", 3); + p = memmem(ptr+5+sal, pkt->size-5-sal, (void *)"off", 3); if (p) { memcpy(p,(void *)"0 ",3); } - p = memmem(pkt->ptr+5+sal, pkt->size-5-sal, (void *)"on", 2); + p = memmem(ptr+5+sal, pkt->size-5-sal, (void *)"on", 2); if (p) { memcpy(p,(void *)"1 ",2); }