From 3de41d49fdd787ce5114372b637dcacc73cdabad Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 10 Jul 2005 09:28:13 +0000 Subject: [PATCH] All signedness fixes --- include/stream_output.h | 4 ++-- include/vlc_httpd.h | 4 +++- src/misc/httpd.c | 2 +- src/stream_output/sap.c | 6 +++--- src/video_output/video_output.c | 8 ++++---- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/stream_output.h b/include/stream_output.h index f039501427..846fd7e6ff 100644 --- a/include/stream_output.h +++ b/include/stream_output.h @@ -267,8 +267,8 @@ struct announce_method_t struct sap_session_t { char *psz_sdp; - char *psz_data; - int i_length; + uint8_t *psz_data; + unsigned i_length; sap_address_t *p_address; /* Last and next send */ diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index b6b4edbd40..d716fbe40d 100644 --- a/include/vlc_httpd.h +++ b/include/vlc_httpd.h @@ -82,7 +82,9 @@ struct httpd_message_t /* for a query */ char *psz_url; - char *psz_args; /* FIXME find a clean way to handle GET(psz_args) and POST(body) through the same code */ + /* FIXME find a clean way to handle GET(psz_args) + and POST(body) through the same code */ + uint8_t *psz_args; /* for rtp over rtsp */ int i_channel; diff --git a/src/misc/httpd.c b/src/misc/httpd.c index 91649d91c2..5e7f66c580 100644 --- a/src/misc/httpd.c +++ b/src/misc/httpd.c @@ -466,7 +466,7 @@ static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, if( query->i_type != HTTPD_MSG_HEAD ) { - char *psz_args = query->psz_args; + uint8_t *psz_args = query->psz_args; if( query->i_type == HTTPD_MSG_POST ) { /* Check that */ diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c index 10fddd48e1..279821fbac 100644 --- a/src/stream_output/sap.c +++ b/src/stream_output/sap.c @@ -483,8 +483,8 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, psz_head[ i_header_size-1 ] = '\0'; p_sap_session->i_length = i_header_size + strlen( p_sap_session->psz_sdp); - p_sap_session->psz_data = (char *)malloc( sizeof(char)* - p_sap_session->i_length ); + p_sap_session->psz_data = (uint8_t *)malloc( sizeof(char)* + p_sap_session->i_length ); /* Build the final message */ memcpy( p_sap_session->psz_data, psz_head, i_header_size ); @@ -665,7 +665,7 @@ static int SDPGenerate( sap_handler_t *p_sap, session_descriptor_t *p_session ) static int CalculateRate( sap_handler_t *p_sap, sap_address_t *p_address ) { int i_read; - char buffer[SAP_MAX_BUFFER]; + uint8_t buffer[SAP_MAX_BUFFER]; int i_tot = 0; mtime_t i_temp; int i_rate; diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index e09634212e..5cd073cd93 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -59,7 +59,7 @@ static void DestroyThread ( vout_thread_t * ); static void AspectRatio ( int, int *, int * ); static int BinaryLog ( uint32_t ); static void MaskToShift ( int *, int *, uint32_t ); -static void InitWindowSize ( vout_thread_t *, int *, int * ); +static void InitWindowSize ( vout_thread_t *, unsigned *, unsigned * ); /* Object variables callbacks */ static int DeinterlaceCallback( vlc_object_t *, char const *, @@ -128,7 +128,7 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, p_vout = vlc_object_find( p_playlist, VLC_OBJECT_VOUT, FIND_CHILD ); /* only first children of p_input for unused vout */ - if( p_vout && p_vout->p_parent != p_playlist ) + if( p_vout && p_vout->p_parent != (vlc_object_t *)p_playlist ) { vlc_object_release( p_vout ); p_vout = NULL; @@ -1256,8 +1256,8 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) * This function will check the "width", "height" and "zoom" config options and * will calculate the size that the video window should have. *****************************************************************************/ -static void InitWindowSize( vout_thread_t *p_vout, int *pi_width, - int *pi_height ) +static void InitWindowSize( vout_thread_t *p_vout, unsigned *pi_width, + unsigned *pi_height ) { vlc_value_t val; int i_width, i_height; -- 2.39.2