From f9c89a2e21e020741623ff07e909208ef305c96b Mon Sep 17 00:00:00 2001 From: Sergey Dryabzhinsky Date: Tue, 22 Sep 2015 22:18:24 +0300 Subject: [PATCH] Fix type warnings --- ngx_rtmp.h | 4 ++-- ngx_rtmp_send.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ngx_rtmp.h b/ngx_rtmp.h index a49193d..f3a3d6f 100644 --- a/ngx_rtmp.h +++ b/ngx_rtmp.h @@ -586,8 +586,8 @@ ngx_int_t ngx_rtmp_send_sample_access(ngx_rtmp_session_t *s); ngx_int_t ngx_rtmp_send_redirect_status(ngx_rtmp_session_t *s, char *callMethod, char *desc, ngx_str_t to_url); ngx_int_t ngx_rtmp_send_close_method(ngx_rtmp_session_t *s, char *methodName); -ngx_int_t ngx_rtmp_send_fcpublish(ngx_rtmp_session_t *s, char *desc); -ngx_int_t ngx_rtmp_send_fcunpublish(ngx_rtmp_session_t *s, char *desc); +ngx_int_t ngx_rtmp_send_fcpublish(ngx_rtmp_session_t *s, u_char *desc); +ngx_int_t ngx_rtmp_send_fcunpublish(ngx_rtmp_session_t *s, u_char *desc); ngx_int_t ngx_rtmp_send_fi(ngx_rtmp_session_t *s); diff --git a/ngx_rtmp_send.c b/ngx_rtmp_send.c index ceac866..295f131 100644 --- a/ngx_rtmp_send.c +++ b/ngx_rtmp_send.c @@ -735,7 +735,7 @@ ngx_rtmp_send_close_method(ngx_rtmp_session_t *s, char *methodName) ngx_chain_t * -ngx_rtmp_create_fcpublish(ngx_rtmp_session_t *s, char *desc) +ngx_rtmp_create_fcpublish(ngx_rtmp_session_t *s, u_char *desc) { ngx_rtmp_header_t h; static double trans; @@ -794,7 +794,7 @@ ngx_rtmp_create_fcpublish(ngx_rtmp_session_t *s, char *desc) ngx_int_t -ngx_rtmp_send_fcpublish(ngx_rtmp_session_t *s, char *desc) +ngx_rtmp_send_fcpublish(ngx_rtmp_session_t *s, u_char *desc) { return ngx_rtmp_send_shared_packet(s, ngx_rtmp_create_fcpublish(s, desc)); @@ -802,7 +802,7 @@ ngx_rtmp_send_fcpublish(ngx_rtmp_session_t *s, char *desc) ngx_chain_t * -ngx_rtmp_create_fcunpublish(ngx_rtmp_session_t *s, char *desc) +ngx_rtmp_create_fcunpublish(ngx_rtmp_session_t *s, u_char *desc) { ngx_rtmp_header_t h; static double trans; @@ -861,7 +861,7 @@ ngx_rtmp_create_fcunpublish(ngx_rtmp_session_t *s, char *desc) ngx_int_t -ngx_rtmp_send_fcunpublish(ngx_rtmp_session_t *s, char *desc) +ngx_rtmp_send_fcunpublish(ngx_rtmp_session_t *s, u_char *desc) { return ngx_rtmp_send_shared_packet(s, ngx_rtmp_create_fcunpublish(s, desc)); @@ -929,9 +929,9 @@ ngx_rtmp_create_fi(ngx_rtmp_session_t *s) ngx_memzero(buf_time, sizeof(buf_time)); ngx_memzero(buf_date, sizeof(buf_date)); - errfl = sprintf(buf_time, "%02d:%02d:%02d.%d", tm.tm_hour, tm.tm_min, tm.tm_sec, (int)tv.tv_usec); + errfl = sprintf((char *)buf_time, "%02d:%02d:%02d.%d", tm.tm_hour, tm.tm_min, tm.tm_sec, (int)tv.tv_usec); // Strange order, but FMLE send like this - errfl = sprintf(buf_date, "%02d-%02d-%04d", tm.tm_mday, tm.tm_mon + 1, tm.tm_year + 1900); + errfl = sprintf((char *)buf_date, "%02d-%02d-%04d", tm.tm_mday, tm.tm_mon + 1, tm.tm_year + 1900); out_inf[0].data = buf_time; out_inf[1].data = buf_date;