未验证 提交 fb28ce53 编写于 作者: S Shengliang Guan 提交者: GitHub

Merge pull request #5026 from taosdata/feature/mac

TD-2837
...@@ -114,4 +114,3 @@ bool taosGetSystemUid(char *uid) { ...@@ -114,4 +114,3 @@ bool taosGetSystemUid(char *uid) {
uuid_unparse(uuid, uid); uuid_unparse(uuid, uid);
return true; return true;
} }
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define TDENGINE_HTTP_UTIL_H #define TDENGINE_HTTP_UTIL_H
bool httpCheckUsedbSql(char *sql); bool httpCheckUsedbSql(char *sql);
void httpTimeToString(time_t t, char *buf, int32_t buflen); void httpTimeToString(int32_t t, char *buf, int32_t buflen);
bool httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp); bool httpUrlMatch(HttpContext *pContext, int32_t pos, char *cmp);
bool httpParseRequest(HttpContext *pContext); bool httpParseRequest(HttpContext *pContext);
......
...@@ -29,7 +29,7 @@ bool httpCheckUsedbSql(char *sql) { ...@@ -29,7 +29,7 @@ bool httpCheckUsedbSql(char *sql) {
return false; return false;
} }
void httpTimeToString(time_t t, char *buf, int32_t buflen) { void httpTimeToString(int32_t t, char *buf, int32_t buflen) {
memset(buf, 0, (size_t)buflen); memset(buf, 0, (size_t)buflen);
char ts[32] = {0}; char ts[32] = {0};
...@@ -37,7 +37,7 @@ void httpTimeToString(time_t t, char *buf, int32_t buflen) { ...@@ -37,7 +37,7 @@ void httpTimeToString(time_t t, char *buf, int32_t buflen) {
time_t tt = t / 1000; time_t tt = t / 1000;
ptm = localtime(&tt); ptm = localtime(&tt);
strftime(ts, 31, "%Y-%m-%d %H:%M:%S", ptm); strftime(ts, 31, "%Y-%m-%d %H:%M:%S", ptm);
sprintf(buf, "%s.%03" PRId64, ts, (int64_t)(t % 1000)); sprintf(buf, "%s.%03d", ts, t % 1000);
} }
int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...) { int32_t httpAddToSqlCmdBuffer(HttpContext *pContext, const char *const format, ...) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册