amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 02:34:26 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复拼写错误

Browse Source
This commit is contained in:
xiongziliang 2020-02-21 11:35:53 +08:00
parent c56a0a0624
commit 618b028da4
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/include/mk_util.h
View File

@ -45,20 +45,20 @@ API_EXPORT char* API_CALL mk_util_get_exe_path();
* @param relative_path 同目录下文件的路径相对,可以为null
* @return 文件路径，使用完后需要自己free
*/
API_EXPORT char* API_CALL mk_uitl_get_exe_dir(const char *relative_path);
API_EXPORT char* API_CALL mk_util_get_exe_dir(const char *relative_path);
/**
* 获取unix标准的系统时间戳
* @return 当前系统时间戳
*/
API_EXPORT uint64_t API_CALL mk_uitl_get_current_millisecond();
API_EXPORT uint64_t API_CALL mk_util_get_current_millisecond();
/**
* 获取时间字符串
* @param fmt 时间格式，譬如%Y-%m-%d %H:%M:%S
* @return 时间字符串，使用完后需要自己free
*/
API_EXPORT char* API_CALL mk_uitl_get_current_time_string(const char *fmt);
API_EXPORT char* API_CALL mk_util_get_current_time_string(const char *fmt);
/**
* 打印二进制为字符串
@ -66,7 +66,7 @@ API_EXPORT char* API_CALL mk_uitl_get_current_time_string(const char *fmt);
* @param len 数据长度
* @return 可打印的调试信息，使用完后需要自己free
*/
API_EXPORT char* API_CALL mk_uitl_hex_dump(const void *buf, int len);
API_EXPORT char* API_CALL mk_util_hex_dump(const void *buf, int len);
///////////////////////////////////////////日志/////////////////////////////////////////////
/**

8
api/source/mk_util.cpp
View File

@ -35,23 +35,23 @@ API_EXPORT char* API_CALL mk_util_get_exe_path(){
return strdup(exePath().data());
}
API_EXPORT char* API_CALL mk_uitl_get_exe_dir(const char *relative_path){
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().data());
}
API_EXPORT uint64_t API_CALL mk_uitl_get_current_millisecond(){
API_EXPORT uint64_t API_CALL mk_util_get_current_millisecond(){
return getCurrentMillisecond();
}
API_EXPORT char* API_CALL mk_uitl_get_current_time_string(const char *fmt){
API_EXPORT char* API_CALL mk_util_get_current_time_string(const char *fmt){
assert(fmt);
return strdup(getTimeStr(fmt).data());
}
API_EXPORT char* API_CALL mk_uitl_hex_dump(const void *buf, int len){
API_EXPORT char* API_CALL mk_util_hex_dump(const void *buf, int len){
assert(buf && len > 0);
return strdup(hexdump(buf,len).data());
}

4
api/tests/server.c
View File

@ -396,8 +396,8 @@ static void s_on_exit(int sig){
flag = 0;
}
int main(int argc, char *argv[]) {
char *ini_path = mk_uitl_get_exe_dir("c_api.ini");
char *ssl_path = mk_uitl_get_exe_dir("ssl.p12");
char *ini_path = mk_util_get_exe_dir("c_api.ini");
char *ssl_path = mk_util_get_exe_dir("ssl.p12");
mk_config config = {
.ini = ini_path,

4
api/tests/websocket.c
View File

@ -195,8 +195,8 @@ void test_client(){
}
int main(int argc, char *argv[]) {
char *ini_path = mk_uitl_get_exe_dir("c_api.ini");
char *ssl_path = mk_uitl_get_exe_dir("ssl.p12");
char *ini_path = mk_util_get_exe_dir("c_api.ini");
char *ssl_path = mk_util_get_exe_dir("ssl.p12");
mk_config config = {
.ini = ini_path,