Skip to content

V
vlc-1.1
Commit 7d7fbb05 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Use correct types

parent d7ee68a7
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
modules/demux/ts.c
View file @ 7d7fbb05
...@@ -2487,7 +2487,7 @@ static void EITEventFixString( unsigned char *psz ) ...@@ -2487,7 +2487,7 @@ static void EITEventFixString( unsigned char *psz )
* caracters encoding, for now lets skip it */ * caracters encoding, for now lets skip it */
if( psz[0] >= 0x20 ) if( psz[0] >= 0x20 )
return; return;
if( ( i_len = strlen( psz ) ) > 0 ) if( ( i_len = strlen( (char *) psz ) ) > 0 )
memmove( &psz[0], &psz[1], i_len ); /* Copy the \0 too */ memmove( &psz[0], &psz[1], i_len ); /* Copy the \0 too */
} }
static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
...@@ -2556,8 +2556,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2556,8 +2556,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
memcpy( psz_text, pE->i_text, pE->i_text_length ); memcpy( psz_text, pE->i_text, pE->i_text_length );
psz_text[pE->i_text_length] = '\0'; psz_text[pE->i_text_length] = '\0';
EITEventFixString(psz_name); EITEventFixString((unsigned char *)&psz_name);
EITEventFixString(psz_text); EITEventFixString((unsigned char *)&psz_text);
msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'", msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'",
pE->i_iso_639_code, psz_name, psz_text ); pE->i_iso_639_code, psz_name, psz_text );
} }
...@@ -2578,12 +2578,12 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2578,12 +2578,12 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
memcpy( str1, pE->i_item_description[i], memcpy( str1, pE->i_item_description[i],
pE->i_item_description_length[i] ); pE->i_item_description_length[i] );
str1[pE->i_item_description_length[i]] = '\0'; str1[pE->i_item_description_length[i]] = '\0';
EITEventFixString(str1); EITEventFixString((unsigned char *)&str1);
memcpy( str2, pE->i_item[i], memcpy( str2, pE->i_item[i],
pE->i_item_length[i] ); pE->i_item_length[i] );
str2[pE->i_item_length[i]] = '\0'; str2[pE->i_item_length[i]] = '\0';
EITEventFixString(str2); EITEventFixString((unsigned char *)&str2);
msg_Dbg( p_demux, " - desc='%s' item='%s'", str1, str2 ); msg_Dbg( p_demux, " - desc='%s' item='%s'", str1, str2 );
psz_extra = realloc( psz_extra, psz_extra = realloc( psz_extra,
...@@ -2597,7 +2597,7 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2597,7 +2597,7 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
memcpy( str1, pE->i_text, pE->i_text_length ); memcpy( str1, pE->i_text, pE->i_text_length );
str1[pE->i_text_length] = '\0'; str1[pE->i_text_length] = '\0';
EITEventFixString(str1); EITEventFixString((unsigned char *)&str1);
msg_Dbg( p_demux, " - text='%s'", str1 ); msg_Dbg( p_demux, " - text='%s'", str1 );
psz_extra = realloc( psz_extra, psz_extra = realloc( psz_extra,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment