Changeset 38f300b12dc0e09f4bf9c18450323a177de03b9f

Show
Ignore:
Timestamp:
29/08/06 10:20:19 (2 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1156839619 +0000
git-parent:

[c696a407227ae3be5755e6d39431026ae308244f]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1156839619 +0000
Message:

Fix compiler warnings related to wrong datatypes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/rtsp/access.c

    r89298c1 r38f300b  
    226226        p_sys->p_header = block_New( p_access, 4096 ); 
    227227        p_sys->p_header->i_buffer = 
    228             rmff_dump_header( h, p_sys->p_header->p_buffer, 1024 ); 
     228            rmff_dump_header( h, (char *)p_sys->p_header->p_buffer, 1024 ); 
    229229        rmff_free_header( h ); 
    230230    } 

  • modules/access/rtsp/real.c

    r2cecfed r38f300b  
    211211  uint32_t a, b, c, d, tmp; 
    212212 
    213   ptr1=(key+16); 
    214   ptr2=(key+20); 
     213  ptr1=(uint8_t*)(key+16); 
     214  ptr2=(uint8_t*)(key+20); 
    215215 
    216216  a = LE_32(ptr1); 
    …… 
    339339  if (xor_table != NULL) 
    340340  { 
    341     table_len = strlen(xor_table); 
     341    table_len = strlen((char *)xor_table); 
    342342 
    343343    if (table_len > 56) table_len=56; 
    …… 
    598598 
    599599  int n; 
    600   rmff_dump_pheader(ph, *buffer); 
    601   n=rtsp_read_data(rtsp_session, *buffer + 12, ph->length - 12); 
     600  rmff_dump_pheader(ph, (char*)*buffer); 
     601  n=rtsp_read_data(rtsp_session, (uint8_t*)(*buffer + 12), ph->length - 12); 
    602602  return (n <= 0) ? 0 : n+12; 
    603603} 
    …… 
    671671  if( !description ) 
    672672    goto error; 
    673   if( rtsp_read_data(rtsp_session, description, size) <= 0) 
     673  if( rtsp_read_data(rtsp_session, (uint8_t*)description, size) <= 0) 
    674674    goto error; 
    675675  description[size]=0; 

  • modules/access/rtsp/rtsp.c

    r3d274a1 r38f300b  
    9090  char *psz_string = NULL; 
    9191 
    92   if( rtsp->pf_read_line( rtsp->p_userdata, psz_buffer, (unsigned int)BUF_SIZE ) >= 0 ) 
     92  if( rtsp->pf_read_line( rtsp->p_userdata, (uint8_t*)psz_buffer, (unsigned int)BUF_SIZE ) >= 0 ) 
    9393  { 
    9494    //printf( "<< '%s'\n", psz_buffer ); 
    …… 
    115115    psz_buffer[i_buffer+2] = 0; 
    116116 
    117     i_ret = rtsp->pf_write( rtsp->p_userdata, psz_buffer, i_buffer + 2 ); 
     117    i_ret = rtsp->pf_write( rtsp->p_userdata, (uint8_t*)psz_buffer, i_buffer + 2 ); 
    118118 
    119119    free( psz_buffer ); 
    …… 
    394394 */ 
    395395 
    396 int rtsp_read_data( rtsp_client_t *rtsp, char *buffer, unsigned int size ) 
     396int rtsp_read_data( rtsp_client_t *rtsp, uint8_t *buffer, unsigned int size ) 
    397397{ 
    398398    int i, seq; 
    …… 
    400400    if( size >= 4 ) 
    401401    { 
    402         i = rtsp->pf_read( rtsp->p_userdata, buffer, (unsigned int) 4 ); 
     402        i = rtsp->pf_read( rtsp->p_userdata, (uint8_t*)buffer, (unsigned int) 4 ); 
    403403        if( i < 4 ) return i; 
    404404 

  • modules/access/rtsp/rtsp.h

    r2cb472d r38f300b  
    5959int rtsp_send_ok( rtsp_client_t * ); 
    6060 
    61 int rtsp_read_data( rtsp_client_t *, char *buffer, unsigned int size ); 
     61int rtsp_read_data( rtsp_client_t *, uint8_t *buffer, unsigned int size ); 
    6262 
    6363char* rtsp_search_answers( rtsp_client_t *, const char *tag );