[TBASE-1299]

src/inc/tutil.h

@@ -37,8 +37,8 @@ extern "C" {
 #define tfree(x) \
   {              \
     if (x) {     \
-      free(x);   \
-      x = NULL;  \
+      free((void*)(x));   \
+      x = 0;  \
     }            \
   }
 

src/kit/taosdemo/taosdemo.c

@@ -33,8 +33,6 @@
 
 extern char configDir[];
 
-#pragma GCC diagnostic ignored "-Wmissing-braces"
-
 #define BUFFER_SIZE      65536
 #define MAX_DB_NAME_SIZE 64
 #define MAX_TB_NAME_SIZE 64

src/rpc/src/trpc.c

@@ -246,9 +246,7 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
   pHeader->destId = pConn->peerId;
   pHeader->port = 0;
 
-#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
-  pHeader->uid = (uint32_t)pConn + (uint32_t)getpid();
-#pragma GCC diagnostic warning "-Wpointer-to-int-cast"
+  pHeader->uid = (uint32_t)((int64_t)pConn + (int64_t)getpid());
 
   memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
 
@@ -280,9 +278,7 @@ char *taosBuildReqMsgWithSize(void *param, char type, int size) {
   pHeader->sourceId = pConn->ownId;
   pHeader->destId = pConn->peerId;
 
-#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
-  pHeader->uid = (uint32_t)pConn + (uint32_t)getpid();
-#pragma GCC diagnostic warning "-Wpointer-to-int-cast"
+  pHeader->uid = (uint32_t)((int64_t)pConn + (int64_t)getpid());
 
   memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
 

src/system/detail/src/dnodeSystem.c

@@ -26,9 +26,6 @@
 #include "tglobalcfg.h"
 #include "vnode.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Woverflow"
-
 SModule         tsModule[TSDB_MOD_MAX] = {0};
 uint32_t        tsModuleStatus = 0;
 pthread_mutex_t dmutex;
@@ -219,5 +216,3 @@ void dnodeCountRequest(SCountInfo *info) {
   info->selectReqNum = atomic_exchange_32(&vnodeSelectReqNum, 0);
   info->insertReqNum = atomic_exchange_32(&vnodeInsertReqNum, 0);
 }
-
-#pragma GCC diagnostic pop
\ No newline at end of file

src/system/detail/src/mgmtShell.c

@@ -23,12 +23,6 @@
 #include "tlog.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic push
-
-#pragma GCC diagnostic ignored "-Woverflow"
-#pragma GCC diagnostic ignored "-Wpointer-sign"
-#pragma GCC diagnostic ignored "-Wint-conversion"
-
 #define MAX_LEN_OF_METER_META (sizeof(SMultiMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN)
 
 void *    pShellConn = NULL;
@@ -695,7 +689,7 @@ int mgmtProcessAlterUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
              (strcmp(pConn->pUser->user, "root") == 0)) {
     if ((pAlter->flag & TSDB_ALTER_USER_PASSWD) != 0) {
       memset(pUser->pass, 0, sizeof(pUser->pass));
-      taosEncryptPass(pAlter->pass, strlen(pAlter->pass), pUser->pass);
+      taosEncryptPass((uint8_t *)pAlter->pass, strlen(pAlter->pass), pUser->pass);
     }
     if ((pAlter->flag & TSDB_ALTER_USER_PRIVILEGES) != 0) {
       if (pAlter->privilege == 1) {  // super
@@ -931,7 +925,7 @@ int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
   taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
 
   if (rowsToRead == 0) {
-    uintptr_t oldSign = atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
+    uintptr_t oldSign = (uintptr_t)atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
     if (oldSign != (uintptr_t)pShow) {
       return msgLen;
     }
@@ -1139,8 +1133,9 @@ void mgmtEstablishConn(SConnObj *pConn) {
     }
   }
 
-  uint32_t temp;
-  taosGetRpcConnInfo(pConn->thandle, &temp, &pConn->ip, &pConn->port, &temp, &temp);
+  int32_t tempint32;
+  uint32_t tempuint32;
+  taosGetRpcConnInfo(pConn->thandle, &tempuint32, &pConn->ip, &pConn->port, &tempint32, &tempint32);
   mgmtAddConnIntoAcct(pConn);
 }
 

src/system/detail/src/vnodeMeter.c

@@ -26,8 +26,6 @@
 #include "vnodeUtil.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic ignored "-Wpointer-sign"
-
 #define VALID_TIMESTAMP(key, curKey, prec) (((key) >= 0) && ((key) <= ((curKey) + 36500 * tsMsPerDay[prec])))
 
 int  tsMeterSizeOnFile;

src/system/detail/src/vnodeRead.c

@@ -26,8 +26,6 @@
 #include "vnodeRead.h"
 #include "vnodeUtil.h"
 
-#pragma GCC diagnostic ignored "-Wint-conversion"
-
 int (*pQueryFunc[])(SMeterObj *, SQuery *) = {vnodeQueryFromCache, vnodeQueryFromFile};
 
 int vnodeInterpolationSearchKey(char *pValue, int num, TSKEY key, int order) {
@@ -1003,8 +1001,9 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
 
       if (pDestFilterInfo->filterOnBinary) {
         pDestFilterInfo->len = htobe64(pFilterInfo->len);
-        pDestFilterInfo->pz = calloc(1, pDestFilterInfo->len + 1);
-        memcpy(pDestFilterInfo->pz, pMsg, pDestFilterInfo->len + 1);
+
+        pDestFilterInfo->pz = (int64_t)calloc(1, pDestFilterInfo->len + 1);
+        memcpy((void*)pDestFilterInfo->pz, pMsg, pDestFilterInfo->len + 1);
         pMsg += (pDestFilterInfo->len + 1);
       } else {
         pDestFilterInfo->lowerBndi = htobe64(pFilterInfo->lowerBndi);
@@ -1022,8 +1021,7 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
    * 1. simple projection query on meters, we only record the pSqlFuncExprs[i].colIdx value
    * 2. for complex queries, whole SqlExprs object is required.
    */
-  pQueryMsg->pSqlFuncExprs = malloc(POINTER_BYTES * pQueryMsg->numOfOutputCols);
-
+  pQueryMsg->pSqlFuncExprs = (int64_t)malloc(POINTER_BYTES * pQueryMsg->numOfOutputCols);
   SSqlFuncExprMsg *pExprMsg = (SSqlFuncExprMsg *)pMsg;
 
   for (int32_t i = 0; i < pQueryMsg->numOfOutputCols; ++i) {
@@ -1070,7 +1068,7 @@ int32_t vnodeConvertQueryMeterMsg(SQueryMeterMsg *pQueryMsg) {
   pQueryMsg->colNameLen = htonl(pQueryMsg->colNameLen);
   if (hasArithmeticFunction) {  // column name array
     assert(pQueryMsg->colNameLen > 0);
-    pQueryMsg->colNameList = pMsg;
+    pQueryMsg->colNameList = (int64_t)pMsg;
     pMsg += pQueryMsg->colNameLen;
   }
 

src/system/detail/src/vnodeShell.c

@@ -30,7 +30,6 @@
 #include "vnodeStore.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic ignored "-Wint-conversion"
 extern int tsMaxQueues;
 
 void *      pShellServer = NULL;
@@ -390,7 +389,7 @@ _query_over:
   tfree(pMeterObjList);
   ret = vnodeSendQueryRspMsg(pObj, code, pObj->qhandle);
 
-  free(pQueryMsg->pSidExtInfo);
+  tfree(pQueryMsg->pSidExtInfo);
   for(int32_t i = 0; i < pQueryMsg->numOfCols; ++i) {
     vnodeFreeColumnInfo(&pQueryMsg->colList[i]);
   }
@@ -455,7 +454,7 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
   pRsp->precision = htons(timePrec);
 
   if (code == TSDB_CODE_SUCCESS) {
-    pRsp->offset = htobe64(vnodeGetOffsetVal(pRetrieve->qhandle));
+    pRsp->offset = htobe64(vnodeGetOffsetVal((void*)pRetrieve->qhandle));
     pRsp->useconds = htobe64(((SQInfo *)(pRetrieve->qhandle))->useconds);
   } else {
     pRsp->offset = 0;

src/system/detail/src/vnodeStore.c

@@ -24,9 +24,6 @@
 #include "vnodeUtil.h"
 #include "tstatus.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Woverflow"
-
 int        tsMaxVnode = -1;
 int        tsOpenVnodes = 0;
 SVnodeObj *vnodeList = NULL;
@@ -386,6 +383,3 @@ void vnodeCalcOpenVnodes() {
 void vnodeUpdateHeadFile(int vnode, int oldTables, int newTables) {
   //todo rewrite the head file with newTables
 }
-
-#pragma GCC diagnostic pop
-

src/system/detail/src/vnodeUtil.c

@@ -23,8 +23,6 @@
 #include "vnodeDataFilterFunc.h"
 #include "vnodeUtil.h"
 
-#pragma GCC diagnostic ignored "-Wint-conversion"
-
 int vnodeCheckFileIntegrity(FILE* fp) {
   /*
     int savedSessions, savedMeterSize;