From b1473342e4b1c1dcd52e146b35f2edf88dda21d8 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Sat, 8 Aug 2020 21:34:56 +0800
Subject: [PATCH] TD-1057

---
 deps/iconv/relocatable.c   | 2 +-
 src/client/src/tscServer.c | 2 +-
 src/client/src/tscSub.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/iconv/relocatable.c b/deps/iconv/relocatable.c
index 52cf4c1372..5676eb703f 100644
--- a/deps/iconv/relocatable.c
+++ b/deps/iconv/relocatable.c
@@ -360,7 +360,7 @@ find_shared_library_fullname ()
 
 		  ungetc (c, fp);
 		  shared_library_fullname = NULL; size = 0;
-		  len = taosGetline(&shared_library_fullname, &size, fp);
+		  len = getline(&shared_library_fullname, &size, fp);
 		  if (len >= 0)
 		    {
 		      /* Success: filled shared_library_fullname.  */
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 2977ed01ec..3390710472 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -912,7 +912,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   pSql->cmd.msgType = TSDB_MSG_TYPE_QUERY;
   
   pQueryMsg->head.contLen = htonl(msgLen);
-  assert(msgLen + minMsgSize() <= pCmd->allocSize);
+  assert(msgLen + minMsgSize() <= (int32_t)pCmd->allocSize);
 
   return TSDB_CODE_SUCCESS;
 }
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index f740e3cce9..e9f2c1dc1d 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -426,7 +426,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
 
   size_t size = taosArrayGetSize(pSub->progress) * sizeof(STableIdInfo);
   size += sizeof(SQueryTableMsg) + 4096;
-  tscAllocPayload(&pSql->cmd, size);
+  tscAllocPayload(&pSql->cmd, (int)size);
   for (int retry = 0; retry < 3; retry++) {
     tscRemoveFromSqlList(pSql);