Changeset 6b822f38be4f5958b1e271324bc73f4a7a98b0bc

Show
Ignore:
Timestamp:
09/12/07 18:39:28 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1197221968 +0000
git-parent:

[2d40161cfc100fe926527c94b4df71d83d56e094]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1197221968 +0000
Message:

Use (s)size_t for pf_read and pf_write.
This is very likely to break .*64 platforms.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_access.h

    rd8fc0a9 r6b822f3  
    8989    /* pf_read/pf_block is used to read data. 
    9090     * XXX A access should set one and only one of them */ 
    91     int         (*pf_read) ( access_t *, uint8_t *, int );  /* Return -1 if no data yet, 0 if no more data, else real data read */ 
     91    ssize_t     (*pf_read) ( access_t *, uint8_t *, size_t );  /* Return -1 if no data yet, 0 if no more data, else real data read */ 
    9292    block_t    *(*pf_block)( access_t * );                  /* return a block of data in his 'natural' size, NULL if not yet data or eof */ 
    9393 

  • include/vlc_sout.h

    re7d9e56 r6b822f3  
    9494    sout_access_out_sys_t   *p_sys; 
    9595    int                     (*pf_seek)( sout_access_out_t *, off_t ); 
    96     int                     (*pf_read)( sout_access_out_t *, block_t * ); 
    97     int                     (*pf_write)( sout_access_out_t *, block_t * ); 
     96    ssize_t                 (*pf_read)( sout_access_out_t *, block_t * ); 
     97    ssize_t                 (*pf_write)( sout_access_out_t *, block_t * ); 
    9898    int                     (*pf_control)( sout_access_out_t *, int, va_list); 
    9999 
    …… 
    105105VLC_EXPORT( void,               sout_AccessOutDelete, ( sout_access_out_t * ) ); 
    106106VLC_EXPORT( int,                sout_AccessOutSeek,   ( sout_access_out_t *, off_t ) ); 
    107 VLC_EXPORT( int,                sout_AccessOutRead,   ( sout_access_out_t *, block_t * ) ); 
    108 VLC_EXPORT( int,                sout_AccessOutWrite,  ( sout_access_out_t *, block_t * ) ); 
     107VLC_EXPORT( ssize_t,            sout_AccessOutRead,   ( sout_access_out_t *, block_t * ) ); 
     108VLC_EXPORT( ssize_t,            sout_AccessOutWrite,  ( sout_access_out_t *, block_t * ) ); 
    109109VLC_EXPORT( int,                sout_AccessOutControl,( sout_access_out_t *, int, va_list ) ); 
    110110 

  • modules/access/cdda/access.c

    rc3dd560 r6b822f3  
    5656 * Local prototypes 
    5757 *****************************************************************************/ 
    58 static int      CDDARead( access_t *, uint8_t *, int ); 
     58static ssize_t  CDDARead( access_t *, uint8_t *, size_t ); 
    5959static block_t *CDDAReadBlocks( access_t * p_access ); 
    6060static int      CDDASeek( access_t * p_access, int64_t i_pos ); 

  • modules/access/directory.c

    rf452c11 r6b822f3  
    122122typedef struct stat_list_t stat_list_t; 
    123123 
    124 static int Read( access_t *, uint8_t *, int ); 
    125 static int ReadNull( access_t *, uint8_t *, int ); 
     124static ssize_t Read( access_t *, uint8_t *, size_t ); 
     125static ssize_t ReadNull( access_t *, uint8_t *, size_t ); 
    126126static int Control( access_t *, int, va_list ); 
    127127 
    …… 
    173173 * ReadNull: read the directory 
    174174 *****************************************************************************/ 
    175 static int ReadNull( access_t *p_access, uint8_t *p_buffer, int i_len) 
     175static ssize_t ReadNull( access_t *p_access, uint8_t *p_buffer, size_t i_len) 
    176176{ 
    177177    /* Return fake data */ 
    …… 
    183183 * Read: read the directory 
    184184 *****************************************************************************/ 
    185 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) 
     185static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len) 
    186186{ 
    187187    char               *psz; 
    …… 
    262262    /* Return fake data forever */ 
    263263    p_access->pf_read = ReadNull; 
    264     return ReadNull( p_access, p_buffer, i_len ); 
     264    return -1; 
    265265} 
    266266 

  • modules/access/eyetv.c

    rd8fc0a9 r6b822f3  
    7373int lastForwardedPacketId; 
    7474 
    75 static int Read( access_t *, uint8_t *, int ); 
     75static ssize_t Read( access_t *, uint8_t *, size_t ); 
    7676static int Control( access_t *, int, va_list ); 
    7777static void Thread( vlc_object_t * ); 
    …… 
    241241* Read: forwarding data from EyeTV plugin which was received above 
    242242*****************************************************************************/ 
    243 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     243static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    244244{ 
    245245    access_sys_t *p_sys = p_access->p_sys; 

  • modules/access/file.c

    r6ab1061 r6b822f3  
    107107 *****************************************************************************/ 
    108108static int  Seek( access_t *, int64_t ); 
    109 static int  Read( access_t *, uint8_t *, int ); 
     109static ssize_t Read( access_t *, uint8_t *, size_t ); 
    110110static int  Control( access_t *, int, va_list ); 
    111111static block_t *mmapBlock( access_t * ); 
    …… 
    250250 * Read: standard read on a file descriptor. 
    251251 *****************************************************************************/ 
    252 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     252static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    253253{ 
    254254    access_sys_t *p_sys = p_access->p_sys; 

  • modules/access/ftp.c

    rd8fc0a9 r6b822f3  
    9393 * Local prototypes 
    9494 *****************************************************************************/ 
    95 static int Read( access_t *, uint8_t *, int ); 
    96 static int Write( sout_access_out_t *, block_t * ); 
     95static ssize_t Read( access_t *, uint8_t *, size_t ); 
     96static ssize_t Write( sout_access_out_t *, block_t * ); 
    9797static int Seek( access_t *, int64_t ); 
    9898static int OutSeek( sout_access_out_t *, int64_t ); 
    …… 
    462462 * Read: 
    463463 *****************************************************************************/ 
    464 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     464static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    465465{ 
    466466    access_sys_t *p_sys = p_access->p_sys; 
    …… 
    486486 * Write: 
    487487 *****************************************************************************/ 
    488 static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 
     488static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) 
    489489{ 
    490490    access_sys_t *p_sys = GET_OUT_SYS(p_access); 

  • modules/access/http.c

    rd8fc0a9 r6b822f3  
    144144 
    145145/* */ 
    146 static int Read( access_t *, uint8_t *, int ); 
     146static ssize_t Read( access_t *, uint8_t *, size_t ); 
    147147static int Seek( access_t *, int64_t ); 
    148148static int Control( access_t *, int, va_list ); 
    …… 
    460460 *****************************************************************************/ 
    461461static int ReadICYMeta( access_t *p_access ); 
    462 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     462static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    463463{ 
    464464    access_sys_t *p_sys = p_access->p_sys; 

  • modules/access/mms/mmsh.c

    rdd735eb r6b822f3  
    4949void E_(MMSHClose) ( access_t * ); 
    5050 
    51 static int  Read( access_t *, uint8_t *, int ); 
    52 static int  ReadRedirect( access_t *, uint8_t *, int ); 
     51static ssize_t Read( access_t *, uint8_t *, size_t ); 
     52static ssize_t ReadRedirect( access_t *, uint8_t *, size_t ); 
    5353static int  Seek( access_t *, int64_t ); 
    5454static int  Control( access_t *, int, va_list ); 
    …… 
    339339 * Read: 
    340340 *****************************************************************************/ 
    341 static int ReadRedirect( access_t *p_access, uint8_t *p, int i_len ) 
    342 { 
    343     return VLC_SUCCESS; 
     341static ssize_t ReadRedirect( access_t *p_access, uint8_t *p, size_t i_len ) 
     342{ 
     343    return 0; 
    344344} 
    345345 
    …… 
    347347 * Read: 
    348348 *****************************************************************************/ 
    349 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     349static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    350350{ 
    351351    access_sys_t *p_sys = p_access->p_sys; 
    …… 
    354354 
    355355    if( p_access->info.b_eof ) 
    356         return VLC_SUCCESS; 
     356        return 0; 
    357357 
    358358    while( i_data < (size_t) i_len ) 

  • modules/access/mms/mmstu.c

    rd8fc0a9 r6b822f3  
    6969 
    7070 
    71 static int Read( access_t *, uint8_t *, int ); 
     71static ssize_t Read( access_t *, uint8_t *, size_t ); 
    7272static int Seek( access_t *, int64_t ); 
    7373static int Control( access_t *, int, va_list ); 
    …… 
    371371 * Read: 
    372372 *****************************************************************************/ 
    373 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     373static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    374374{ 
    375375    access_sys_t *p_sys = p_access->p_sys; 

  • modules/access/pvr.c

    rd8fc0a9 r6b822f3  
    167167 * Prototypes 
    168168 *****************************************************************************/ 
    169 static int Read   ( access_t *, uint8_t *, int ); 
     169static ssize_t Read   ( access_t *, uint8_t *, size_t ); 
    170170static int Control( access_t *, int, va_list ); 
    171171 
    …… 
    10641064 * Read 
    10651065 *****************************************************************************/ 
    1066 static int Read( access_t * p_access, uint8_t * p_buffer, int i_len ) 
     1066static ssize_t Read( access_t * p_access, uint8_t * p_buffer, size_t i_len ) 
    10671067{ 
    10681068    access_sys_t *p_sys = (access_sys_t *) p_access->p_sys; 

  • modules/access/smb.c

    rd8fc0a9 r6b822f3  
    9292 * Local prototypes 
    9393 *****************************************************************************/ 
    94 static int Read( access_t *, uint8_t *, int ); 
     94static ssize_t Read( access_t *, uint8_t *, size_t ); 
    9595static int Seek( access_t *, int64_t ); 
    9696static int Control( access_t *, int, va_list ); 
    …… 
    349349 * Read: 
    350350 *****************************************************************************/ 
    351 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     351static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    352352{ 
    353353    access_sys_t *p_sys = p_access->p_sys; 

  • modules/access/tcp.c

    rd8fc0a9 r6b822f3  
    6565 
    6666 
    67 static int Read( access_t *, uint8_t *, int ); 
     67static ssize_t Read( access_t *, uint8_t *, size_t ); 
    6868static int Control( access_t *, int, va_list ); 
    6969 
    …… 
    133133 * Read: read on a file descriptor, checking b_die periodically 
    134134 *****************************************************************************/ 
    135 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     135static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    136136{ 
    137137    access_sys_t *p_sys = p_access->p_sys; 

  • modules/access_filter/bandwidth.c

    r8917f56 r6b822f3  
    5050vlc_module_end(); 
    5151 
    52 static int Read (access_t *access, uint8_t *buffer, int len); 
     52static ssize_t Read (access_t *access, uint8_t *buffer, size_t len); 
    5353static int Seek (access_t *access, int64_t offset); 
    5454static int Control (access_t *access, int cmd, va_list ap); 
    …… 
    108108 
    109109 
    110 static int Read (access_t *access, uint8_t *buffer, int len) 
     110static ssize_t Read (access_t *access, uint8_t *buffer, size_t len) 
    111111{ 
    112112    access_t *src = access->p_source; 

  • modules/access_filter/dump.c

    r552e595 r6b822f3  
    6161vlc_module_end(); 
    6262 
    63 static int Read (access_t *access, uint8_t *buffer, int len); 
     63static ssize_t Read (access_t *access, uint8_t *buffer, size_t len); 
    6464static block_t *Block (access_t *access); 
    6565static int Seek (access_t *access, int64_t offset); 
    …… 
    181181 
    182182 
    183 static int Read (access_t *access, uint8_t *buffer, int len) 
     183static ssize_t Read (access_t *access, uint8_t *buffer, size_t len) 
    184184{ 
    185185    access_t *src = access->p_source; 

  • modules/access_filter/record.c

    r552e595 r6b822f3  
    6868 
    6969static block_t *Block  ( access_t * ); 
    70 static int      Read   ( access_t *, uint8_t *, int ); 
     70static ssize_t  Read   ( access_t *, uint8_t *, size_t ); 
    7171static int      Control( access_t *, int i_query, va_list args ); 
    7272static int      Seek   ( access_t *, int64_t ); 
    …… 
    206206 * 
    207207 *****************************************************************************/ 
    208 static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) 
     208static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) 
    209209{ 
    210210    access_t     *p_src = p_access->p_source; 

  • modules/access_output/file.c

    r552e595 r6b822f3  
    8484}; 
    8585 
    86 static int Write( sout_access_out_t *, block_t * ); 
     86static ssize_t Write( sout_access_out_t *, block_t * ); 
    8787static int Seek ( sout_access_out_t *, off_t  ); 
    88 static int Read ( sout_access_out_t *, block_t * ); 
     88static ssize_t Read ( sout_access_out_t *, block_t * ); 
    8989 
    9090struct sout_access_out_sys_t 
    …… 
    185185 * Read: standard read on a file descriptor. 
    186186 *****************************************************************************/ 
    187 static int Read( sout_access_out_t *p_access, block_t *p_buffer ) 
     187static ssize_t Read( sout_access_out_t *p_access, block_t *p_buffer ) 
    188188{ 
    189189    if( strcmp( p_access->psz_path, "-" ) ) 
    …… 
    200200 * Write: standard write on a file descriptor. 
    201201 *****************************************************************************/ 
    202 static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 
     202static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) 
    203203{ 
    204204    size_t i_write = 0; 

  • modules/access_output/http.c

    rdb1a5bd r6b822f3  
    123123}; 
    124124 
    125 static int Write( sout_access_out_t *, block_t * ); 
     125static ssize_t Write( sout_access_out_t *, block_t * ); 
    126126static int Seek ( sout_access_out_t *, off_t  ); 
    127127 
    …… 
    374374 * Write: 
    375375 *****************************************************************************/ 
    376 static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 
     376static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) 
    377377{ 
    378378    sout_access_out_sys_t *p_sys = p_access->p_sys; 

  • modules/access_output/shout.c

    re755d8f r6b822f3  
    145145 * Exported prototypes 
    146146 *****************************************************************************/ 
    147 static int Write( sout_access_out_t *, block_t * ); 
     147static ssize_t Write( sout_access_out_t *, block_t * ); 
    148148static int Seek ( sout_access_out_t *, off_t  ); 
    149 static int Read ( sout_access_out_t *, block_t * ); 
    150149 
    151150struct sout_access_out_sys_t 
    …… 
    446445 
    447446    p_access->pf_write = Write; 
    448     p_access->pf_read  = Read; 
    449447    p_access->pf_seek  = Seek; 
    450448 
    …… 
    487485 
    488486/***************************************************************************** 
    489  * Read: standard read -- not supported 
    490  *****************************************************************************/ 
    491 static int Read( sout_access_out_t *p_access, block_t *p_buffer ) 
    492 { 
    493     msg_Err( p_access, "cannot read from shout" ); 
    494     return VLC_EGENERIC; 
    495 } 
    496  
    497 /***************************************************************************** 
    498487 * Write: standard write 
    499488 *****************************************************************************/ 
    500 static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 
     489static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) 
    501490{ 
    502491    size_t i_write = 0; 

  • modules/access_output/udp.c

    r7719d71 r6b822f3  
    113113}; 
    114114 
    115 static int Write   ( sout_access_out_t *, block_t * ); 
     115static ssize_t Write   ( sout_access_out_t *, block_t * ); 
    116116static int  Seek    ( sout_access_out_t *, off_t  ); 
    117117 
    …… 
    324324 * Write: standard write on a file descriptor. 
    325325 *****************************************************************************/ 
    326 static int Write( sout_access_out_t *p_access, block_t *p_buffer ) 
     326static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) 
    327327{ 
    328328    sout_access_out_sys_t *p_sys = p_access->p_sys; 

  • src/stream_output/stream_output.c

    re7d9e56 r6b822f3  
    366366 * sout_AccessRead: 
    367367 *****************************************************************************/ 
    368 int sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) 
     368ssize_t sout_AccessOutRead( sout_access_out_t *p_access, block_t *p_buffer ) 
    369369{ 
    370370    return( p_access->pf_read ? 
    …… 
    375375 * sout_AccessWrite: 
    376376 *****************************************************************************/ 
    377 int sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) 
    378 { 
    379     const int i_packets_gather = 30; 
     377ssize_t sout_AccessOutWrite( sout_access_out_t *p_access, block_t *p_buffer ) 
     378{ 
     379    const unsigned i_packets_gather = 30; 
    380380    p_access->i_writes++; 
    381381    p_access->i_sent_bytes += p_buffer->i_buffer;