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

2026-03-31 02:30:52 +08:00 · 2021-01-17 18:31:50 +08:00
parent fb1e35a39a
commit b6cbc87712
272 changed files with 936 additions and 933 deletions
--- a/api/include/mk_common.h
+++ b/api/include/mk_common.h
@@ -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
@@ -12,6 +12,7 @@
 #define MK_COMMON_H

 #include <stdint.h>
+#include <stddef.h>

 #if defined(_WIN32)

--- a/api/include/mk_events.h
+++ b/api/include/mk_events.h
@@ -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
@@ -148,8 +148,8 @@ typedef struct {
     * @param is_player 客户端是否为播放器
     */
    void (API_CALL *on_mk_flow_report)(const mk_media_info url_info,
-                                       uint64_t total_bytes,
-                                       uint64_t total_seconds,
+                                       size_t total_bytes,
+                                       size_t total_seconds,
                                       int is_player,
                                       const mk_sock_info sender);
 } mk_events;
--- a/api/include/mk_events_objects.h
+++ b/api/include/mk_events_objects.h
@@ -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
@@ -24,7 +24,7 @@ API_EXPORT uint64_t API_CALL mk_mp4_info_get_start_time(const mk_mp4_info ctx);
 // 录像长度，单位秒
 API_EXPORT float API_CALL mk_mp4_info_get_time_len(const mk_mp4_info ctx);
 // 文件大小，单位 BYTE
-API_EXPORT uint64_t API_CALL mk_mp4_info_get_file_size(const mk_mp4_info ctx);
+API_EXPORT size_t API_CALL mk_mp4_info_get_file_size(const mk_mp4_info ctx);
 // 文件路径
 API_EXPORT const char* API_CALL mk_mp4_info_get_file_path(const mk_mp4_info ctx);
 // 文件名称
@@ -58,7 +58,7 @@ API_EXPORT const char* API_CALL mk_parser_get_tail(const mk_parser ctx);
 //Parser::getValues()["key"],获取HTTP头中特定字段
 API_EXPORT const char* API_CALL mk_parser_get_header(const mk_parser ctx,const char *key);
 //Parser::Content(),获取HTTP body
-API_EXPORT const char* API_CALL mk_parser_get_content(const mk_parser ctx, int *length);
+API_EXPORT const char* API_CALL mk_parser_get_content(const mk_parser ctx, size_t *length);

 ///////////////////////////////////////////MediaInfo/////////////////////////////////////////////
 //MediaInfo对象的C映射
@@ -143,7 +143,7 @@ typedef void* mk_http_body;
 * @param str 字符串指针
 * @param len 字符串长度，为0则用strlen获取
 */
-API_EXPORT mk_http_body API_CALL mk_http_body_from_string(const char *str,int len);
+API_EXPORT mk_http_body API_CALL mk_http_body_from_string(const char *str,size_t len);

 /**
 * 生成HttpFileBody
--- a/api/include/mk_httpclient.h
+++ b/api/include/mk_httpclient.h
@@ -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
@@ -129,7 +129,7 @@ API_EXPORT const char* API_CALL mk_http_requester_get_response_header(mk_http_re
 * @param length 返回body长度,可以为null
 * @return body指针
 */
-API_EXPORT const char* API_CALL mk_http_requester_get_response_body(mk_http_requester ctx, int *length);
+API_EXPORT const char* API_CALL mk_http_requester_get_response_body(mk_http_requester ctx, size_t *length);

 /**
 * 在收到HTTP回复后可调用该方法获取响应
--- a/api/include/mk_media.h
+++ b/api/include/mk_media.h
@@ -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
@@ -47,7 +47,7 @@ API_EXPORT void API_CALL mk_media_release(mk_media ctx);
 * @param height 视频高度
 * @param fps 视频fps
 */
-API_EXPORT void API_CALL mk_media_init_video(mk_media ctx, int track_id, int width, int height, int fps);
+API_EXPORT void API_CALL mk_media_init_video(mk_media ctx, int track_id, int width, int height, float fps);

 /**
 * 添加音频轨道
--- a/api/include/mk_mediakit.h
+++ b/api/include/mk_mediakit.h
@@ -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
--- a/api/include/mk_player.h
+++ b/api/include/mk_player.h
@@ -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
@@ -37,7 +37,7 @@ typedef void(API_CALL *on_mk_play_event)(void *user_data,int err_code,const char
 * @param dts 解码时间戳，单位毫秒
 * @param pts 显示时间戳，单位毫秒
 */
-typedef void(API_CALL *on_mk_play_data)(void *user_data,int track_type,int codec_id,void *data,int len,uint32_t dts,uint32_t pts);
+typedef void(API_CALL *on_mk_play_data)(void *user_data,int track_type,int codec_id,void *data,size_t len, uint32_t dts,uint32_t pts);

 /**
 * 创建一个播放器,支持rtmp[s]/rtsp[s]
@@ -125,7 +125,7 @@ API_EXPORT int API_CALL mk_player_video_height(mk_player ctx);
 /**
 * 获取视频帧率
 */
-API_EXPORT int API_CALL mk_player_video_fps(mk_player ctx);
+API_EXPORT float API_CALL mk_player_video_fps(mk_player ctx);

 /**
 * 获取音频codec_id -1：不存在 0：H264，1：H265，2：AAC 3.G711A 4.G711U
--- a/api/include/mk_proxyplayer.h
+++ b/api/include/mk_proxyplayer.h
@@ -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
--- a/api/include/mk_pusher.h
+++ b/api/include/mk_pusher.h
@@ -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
--- a/api/include/mk_recorder.h
+++ b/api/include/mk_recorder.h
@@ -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
--- a/api/include/mk_rtp_server.h
+++ b/api/include/mk_rtp_server.h
@@ -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
--- a/api/include/mk_tcp.h
+++ b/api/include/mk_tcp.h
@@ -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
@@ -53,9 +53,9 @@ API_EXPORT mk_sock_info API_CALL mk_tcp_session_get_sock_info(const mk_tcp_sessi
 //TcpSession::safeShutdown()
 API_EXPORT void API_CALL mk_tcp_session_shutdown(const mk_tcp_session ctx,int err,const char *err_msg);
 //TcpSession::send()
-API_EXPORT void API_CALL mk_tcp_session_send(const mk_tcp_session ctx,const char *data,int len);
+API_EXPORT void API_CALL mk_tcp_session_send(const mk_tcp_session ctx,const char *data,size_t len);
 //切换到该对象所在线程后再TcpSession::send()
-API_EXPORT void API_CALL mk_tcp_session_send_safe(const mk_tcp_session ctx,const char *data,int len);
+API_EXPORT void API_CALL mk_tcp_session_send_safe(const mk_tcp_session ctx,const char *data,size_t len);

 ///////////////////////////////////////////自定义tcp服务/////////////////////////////////////////////

@@ -74,7 +74,7 @@ typedef struct {
     * @param data 数据指针
     * @param len 数据长度
     */
-    void (API_CALL *on_mk_tcp_session_data)(uint16_t server_port,mk_tcp_session session,const char *data,int len);
+    void (API_CALL *on_mk_tcp_session_data)(uint16_t server_port,mk_tcp_session session,const char *data,size_t len);

    /**
     * 每隔2秒的定时器，用于管理超时等任务
@@ -164,7 +164,7 @@ typedef struct {
     * @param data 数据指针
     * @param len 数据长度
     */
-    void (API_CALL *on_mk_tcp_client_data)(mk_tcp_client client,const char *data,int len);
+    void (API_CALL *on_mk_tcp_client_data)(mk_tcp_client client,const char *data,size_t len);

    /**
     * 每隔2秒的定时器，用于管理超时等任务
--- a/api/include/mk_thread.h
+++ b/api/include/mk_thread.h
@@ -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
--- a/api/include/mk_util.h
+++ b/api/include/mk_util.h
@@ -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