Skip to content

V
vlc-2-2
Commit d0dd8a45 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

linsys: use vlc_strerror_c()

parent ae0bd671
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 20 deletions
modules/access/linsys/linsys_hdsdi.c
View file @ d0dd8a45
......@@ -678,7 +678,7 @@ static int InitCapture( demux_t *p_demux )
if ( poll( pfd, 1, READ_TIMEOUT ) < 0 )
{
msg_Warn( p_demux, "couldn't poll(): %m" );
msg_Warn( p_demux, "couldn't poll(): %s", vlc_strerror_c(errno) );
close( p_sys->i_vfd );
return VLC_EGENERIC;
}
......@@ -688,7 +688,8 @@ static int InitCapture( demux_t *p_demux )
unsigned int i_val;
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS %m" );
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS: %s",
vlc_strerror_c(errno) );
else
{
if ( i_val & SDIVIDEO_EVENT_RX_BUFFER )
......@@ -716,7 +717,8 @@ static int InitCapture( demux_t *p_demux )
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETVIDSTATUS, &p_sys->i_standard )
< 0 )
{
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETVIDSTATUS %m" );
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETVIDSTATUS: %s",
vlc_strerror_c(errno) );
close( p_sys->i_vfd );
return VLC_EGENERIC;
}
......@@ -742,7 +744,8 @@ static int InitCapture( demux_t *p_demux )
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_RXGETAUDRATE, &i_rate ) < 0 )
{
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETAUDRATE %m" );
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETAUDRATE: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
switch ( i_rate )
......@@ -830,7 +833,8 @@ static int InitCapture( demux_t *p_demux )
PROT_READ, MAP_SHARED, p_sys->i_afd,
i * i_bufmemsize )) == MAP_FAILED )
{
msg_Err( p_demux, "couldn't mmap(%d): %m", i );
msg_Err( p_demux, "couldn't mmap(%d): %s", i,
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
}
......@@ -884,7 +888,8 @@ static int InitCapture( demux_t *p_demux )
PROT_READ, MAP_SHARED, p_sys->i_vfd,
i * i_bufmemsize )) == MAP_FAILED )
{
msg_Err( p_demux, "couldn't mmap(%d): %m", i );
msg_Err( p_demux, "couldn't mmap(%d): %s", i,
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
}
......@@ -930,7 +935,7 @@ static int Capture( demux_t *p_demux )
if ( poll( pfd, 1 + (p_sys->i_max_channel != -1), READ_TIMEOUT ) < 0 )
{
msg_Warn( p_demux, "couldn't poll(): %m" );
msg_Warn( p_demux, "couldn't poll(): %s", vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -939,7 +944,8 @@ static int Capture( demux_t *p_demux )
unsigned int i_val;
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS %m" );
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS: %s",
vlc_strerror_c(errno) );
else
{
if ( i_val & SDIVIDEO_EVENT_RX_BUFFER )
......@@ -963,7 +969,8 @@ static int Capture( demux_t *p_demux )
unsigned int i_val;
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETEVENTS %m" );
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETEVENTS: %s",
vlc_strerror_c(errno) );
else
{
if ( i_val & SDIAUDIO_EVENT_RX_BUFFER )
......@@ -986,7 +993,8 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_DQBUF, p_sys->i_current_vbuffer )
< 0 )
{
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_DQBUF %m" );
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_DQBUF: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -996,7 +1004,8 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_QBUF, p_sys->i_current_vbuffer )
< 0 )
{
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_QBUF %m" );
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_QBUF: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -1009,7 +1018,7 @@ static int Capture( demux_t *p_demux )
if ( read( p_sys->i_vfd, p_buffer, p_sys->i_vbuffer_size ) < 0 )
{
msg_Warn( p_demux, "couldn't read %m" );
msg_Warn( p_demux, "couldn't read: %s", vlc_strerror_c(errno) );
free( p_buffer );
return VLC_EGENERIC;
}
......@@ -1029,7 +1038,8 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_DQBUF, p_sys->i_current_abuffer )
< 0 )
{
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_DQBUF %m" );
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_DQBUF: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -1039,7 +1049,8 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_QBUF, p_sys->i_current_abuffer )
< 0 )
{
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_QBUF %m" );
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_QBUF: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -1052,7 +1063,7 @@ static int Capture( demux_t *p_demux )
if ( read( p_sys->i_afd, p_buffer, p_sys->i_abuffer_size ) < 0 )
{
msg_Warn( p_demux, "couldn't read %m" );
msg_Warn( p_demux, "couldn't read: %s", vlc_strerror_c(errno) );
free( p_buffer );
return VLC_EGENERIC;
}
......
modules/access/linsys/linsys_sdi.c
View file @ d0dd8a45
......@@ -1759,7 +1759,8 @@ static int InitCapture( demux_t *p_demux )
PROT_READ, MAP_SHARED, p_sys->i_fd,
i * i_bufmemsize )) == MAP_FAILED )
{
msg_Err( p_demux, "couldn't mmap(%d): %m", i );
msg_Err( p_demux, "couldn't mmap(%d): %s", i,
vlc_strerror_c(errno) );
free( p_sys->pp_buffers );
return VLC_EGENERIC;
}
......@@ -1789,7 +1790,7 @@ static int Capture( demux_t *p_demux )
if ( poll( &pfd, 1, READ_TIMEOUT ) < 0 )
{
msg_Warn( p_demux, "couldn't poll(): %m" );
msg_Warn( p_demux, "couldn't poll(): %s", vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -1798,7 +1799,8 @@ static int Capture( demux_t *p_demux )
unsigned int i_val;
if ( ioctl( p_sys->i_fd, SDI_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDI_IOC_RXGETEVENTS %m" );
msg_Warn( p_demux, "couldn't SDI_IOC_RXGETEVENTS: %s",
vlc_strerror_c(errno) );
else
{
if ( i_val & SDI_EVENT_RX_BUFFER )
......@@ -1818,7 +1820,8 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_fd, SDI_IOC_DQBUF, p_sys->i_current_buffer ) < 0 )
{
msg_Warn( p_demux, "couldn't SDI_IOC_DQBUF %m" );
msg_Warn( p_demux, "couldn't SDI_IOC_DQBUF: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......@@ -1828,7 +1831,8 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_fd, SDI_IOC_QBUF, p_sys->i_current_buffer ) < 0 )
{
msg_Warn( p_demux, "couldn't SDI_IOC_QBUF %m" );
msg_Warn( p_demux, "couldn't SDI_IOC_QBUF: %s",
vlc_strerror_c(errno) );
return VLC_EGENERIC;
}
......
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