From e11d87046b5b52c63f156a5616bdc14b45ca11ca Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Mon, 13 Jun 2022 16:37:00 +0800
Subject: [PATCH] os: fix develop win32 compile error

---
 src/mnode/src/mnodeUser.c       | 2 +-
 src/plugins/http/src/httpAuth.c | 2 +-
 src/util/inc/tkey.h             | 2 +-
 src/util/src/tbase64.c          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mnode/src/mnodeUser.c b/src/mnode/src/mnodeUser.c
index 0acf501aa2..2ebe644de1 100644
--- a/src/mnode/src/mnodeUser.c
+++ b/src/mnode/src/mnodeUser.c
@@ -116,7 +116,7 @@ static void mnodePrintUserAuth() {
     pIter = mnodeGetNextUser(pIter, &pUser);
     if (pUser == NULL) break;
 
-    char *base64 = taos_base64_encode((const unsigned char *)pUser->pass, TSDB_KEY_LEN * 2);
+    char *base64 = base64_encode((const unsigned char *)pUser->pass, TSDB_KEY_LEN * 2);
     fprintf(fp, "user:%24s auth:%s\n", pUser->user, base64);
     free(base64);
 
diff --git a/src/plugins/http/src/httpAuth.c b/src/plugins/http/src/httpAuth.c
index d8c75b810e..2ef5406823 100644
--- a/src/plugins/http/src/httpAuth.c
+++ b/src/plugins/http/src/httpAuth.c
@@ -104,7 +104,7 @@ int32_t httpGenTaosdAuthToken(HttpContext *pContext, char *token, int32_t maxLen
   tstrncpy(buffer + sizeof(pContext->user), pContext->pass, size);
 
   char *encrypt = taosDesEncode(KEY_DES_4, buffer, TSDB_USER_LEN + HTTP_PASSWORD_LEN);
-  char *base64 = taos_base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + HTTP_PASSWORD_LEN);
+  char *base64 = base64_encode((const unsigned char *)encrypt, TSDB_USER_LEN + HTTP_PASSWORD_LEN);
 
   size_t len = strlen(base64);
   tstrncpy(token, base64, len + 1);
diff --git a/src/util/inc/tkey.h b/src/util/inc/tkey.h
index 1a3ff25b22..28a0d3a84e 100644
--- a/src/util/inc/tkey.h
+++ b/src/util/inc/tkey.h
@@ -25,7 +25,7 @@ extern "C" {
 #include "tutil.h"
 
 unsigned char *base64_decode(const char *value, int inlen, int *outlen);
-char *taos_base64_encode(const unsigned char *value, int vlen);
+char *base64_encode(const unsigned char *value, int vlen);
 char *taosDesEncode(int64_t key, char *src, int len);
 char *taosDesDecode(int64_t key, char *src, int len);
 
diff --git a/src/util/src/tbase64.c b/src/util/src/tbase64.c
index 7a5dc989b3..1b1f53df17 100644
--- a/src/util/src/tbase64.c
+++ b/src/util/src/tbase64.c
@@ -18,7 +18,7 @@
 // deprecated this file for bug prone
 // base64 encode
 static char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-char *taos_base64_encode(const unsigned char *value, int vlen) {
+char *base64_encode(const unsigned char *value, int vlen) {
   unsigned char oval = 0;
   char *        result = (char *)malloc((size_t)(vlen * 4) / 3 + 10);
   char *        out = result;
-- 
GitLab