Merge pull request #880 from taosdata/feature/slguan

Remove compiler warning options

src/inc/sdb.h

@@ -105,7 +105,7 @@ extern SSdbPeer *sdbPeer[];
 
 #endif
 
-void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, char *directory,
+void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, uint8_t keyType, char *directory,
                    void *(*appTool)(char, void *, char *, int, int *));
 
 void *sdbGetRow(void *handle, void *key);

src/inc/taosmsg.h

@@ -664,7 +664,7 @@ typedef struct {
   uint32_t destId;
   char     meterId[TSDB_UNI_LEN];
   char     empty[3];
-  char     msgType;
+  uint8_t  msgType;
   int32_t  msgLen;
   uint8_t  content[0];
 } SIntMsg;

src/rpc/src/trpc.c

@@ -31,8 +31,6 @@
 #include "tutil.h"
 #include "lz4.h"
 
-#pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
-
 typedef struct _msg_node {
   struct _msg_node *next;
   void *            ahandle;
@@ -58,7 +56,7 @@ typedef struct {
   uint16_t           tranId;         // outgoing transcation ID, for build message
   uint16_t           outTranId;      // outgoing transcation ID
   uint16_t           inTranId;
-  char               outType;
+  uint8_t            outType;
   char               inType;
   char               closing;
   char               rspReceived;
@@ -203,7 +201,7 @@ static STaosHeader* taosDecompressRpcMsg(STaosHeader* pHeader, SSchedMsg* pSched
   //tDump(pHeader->content, msgLen);
   
   if (buf) {
-    int32_t originalLen = LZ4_decompress_safe(pHeader->content + overhead, buf + sizeof(STaosHeader),
+    int32_t originalLen = LZ4_decompress_safe((const char*)(pHeader->content + overhead), buf + sizeof(STaosHeader),
         msgLen - overhead, contLen);
     
     memcpy(buf, pHeader, sizeof(STaosHeader));
@@ -220,6 +218,8 @@ static STaosHeader* taosDecompressRpcMsg(STaosHeader* pHeader, SSchedMsg* pSched
     tError("failed to allocate memory to decompress msg, contLen:%d, reason:%s", contLen, strerror(errno));
     pSchedMsg->msg = NULL;
   }
+
+  return NULL;
 }
 
 char *taosBuildReqHeader(void *param, char type, char *msg) {
@@ -245,7 +245,10 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
   pHeader->sourceId = pConn->ownId;
   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"
 
   memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
 
@@ -276,7 +279,11 @@ 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"
+
   memcpy(pHeader->meterId, pConn->meterId, tListLen(pHeader->meterId));
 
   return (char *)pHeader->content;

src/sdb/inc/sdbint.h

@@ -127,7 +127,7 @@ typedef struct {
 } SMnodeStatus;
 
 typedef struct {
-  char     dbId;
+  uint8_t  dbId;
   char     type;
   uint64_t version;
   short    dataLen;

src/sdb/src/sdbEngine.c

@@ -287,7 +287,7 @@ sdb_exit1:
   return -1;
 }
 
-void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, char keyType, char *directory,
+void *sdbOpenTable(int maxRows, int32_t maxRowSize, char *name, uint8_t keyType, char *directory,
                    void *(*appTool)(char, void *, char *, int, int *)) {
   SSdbTable *pTable = (SSdbTable *)malloc(sizeof(SSdbTable));
   if (pTable == NULL) return NULL;