Changeset 6cf8fa760d1f3afe48de362fa20d06daec80e9b8

Show
Ignore:
Timestamp:
21/01/08 20:07:37 (11 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1200942457 +0000
git-parent:

[cc227c7270cfc3ba47f988df3cdaf232a41a8f34]

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

Remove unnecessary complication

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/misc/objects.c

    r8ead2f5 r6cf8fa7  
    568568    if( fd != -1 ) 
    569569    { 
    570         if( read( fd, &(char){ 0 }, 1 ) == 0 ) 
    571         { 
    572             close( fd ); 
    573             obj->p_internals->pipes[1] = -1; 
    574         } 
     570        while (read (fd, &(char){ 0 }, 1  < 0)); 
    575571        return obj->b_die; 
    576572    } 
    …… 
    660656        for( int i = 0; i < p_this->i_children ; i++ ) 
    661657            vlc_object_kill( p_this->pp_children[i] ); 
    662  
    663     int fd = p_this->p_internals->pipes[1]; 
    664     if( fd != -1 ) 
    665     { 
    666         close( fd ); /* closing a pipe makes it readable too */ 
    667         p_this->p_internals->pipes[1] = -1; 
    668     } 
    669658 
    670659    vlc_object_signal_unlocked( p_this );