Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-16 04:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

全面整理代码，去除编译警告

Browse Source
This commit is contained in:
xia-chu
2021-01-17 18:31:50 +08:00
parent fb1e35a39a
commit b6cbc87712
272 changed files with 936 additions and 933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/source/mk_util.cpp
View File

@@ -1,7 +1,7 @@
/*
* Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
* This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
*
* Use of this source code is governed by MIT license that can be found in the
* LICENSE file in the root of the source tree. All contributing project authors
@@ -15,15 +15,19 @@
using namespace std;
using namespace toolkit;
#ifndef _WIN32
#define _strdup strdup
#endif
API_EXPORT char* API_CALL mk_util_get_exe_path(){
return strdup(exePath().data());
return _strdup(exePath().data());
}
API_EXPORT char* API_CALL mk_util_get_exe_dir(const char *relative_path){
if(relative_path){
return strdup((exeDir() + relative_path).data());
return _strdup((exeDir() + relative_path).data());
}
return strdup(exeDir().data());
return _strdup(exeDir().data());
}
API_EXPORT uint64_t API_CALL mk_util_get_current_millisecond(){
@@ -32,12 +36,12 @@ API_EXPORT uint64_t API_CALL mk_util_get_current_millisecond(){
API_EXPORT char* API_CALL mk_util_get_current_time_string(const char *fmt){
assert(fmt);
return strdup(getTimeStr(fmt).data());
return _strdup(getTimeStr(fmt).data());
}
API_EXPORT char* API_CALL mk_util_hex_dump(const void *buf, int len){
assert(buf && len > 0);
return strdup(hexdump(buf,len).data());
return _strdup(hexdump(buf,len).data());
}
API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *function, int line, const char *fmt, ...) {
@@ -46,7 +50,7 @@ API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *
va_list pArg;
va_start(pArg, fmt);
char buf[4096];
int n = vsprintf(buf, fmt, pArg);
auto n = vsnprintf(buf, sizeof(buf), fmt, pArg);
buf[n] = '\0';
va_end(pArg);
info << buf;