Skip to content

V
vlc
Commit e2df0a99 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Linsys: don't use strerror

parent 942ab6c3
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 29 deletions
modules/access/linsys/linsys_hdsdi.c
View file @ e2df0a99
...@@ -686,7 +686,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -686,7 +686,7 @@ static int InitCapture( demux_t *p_demux )
if ( poll( pfd, 1, READ_TIMEOUT ) < 0 ) if ( poll( pfd, 1, READ_TIMEOUT ) < 0 )
{ {
msg_Warn( p_demux, "couldn't poll(): %s", strerror(errno) ); msg_Warn( p_demux, "couldn't poll(): %m" );
close( p_sys->i_vfd ); close( p_sys->i_vfd );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -696,8 +696,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -696,8 +696,7 @@ static int InitCapture( demux_t *p_demux )
unsigned int i_val; unsigned int i_val;
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETEVENTS, &i_val ) < 0 ) if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS %s", msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS %m" );
strerror(errno) );
else else
{ {
if ( i_val & SDIVIDEO_EVENT_RX_BUFFER ) if ( i_val & SDIVIDEO_EVENT_RX_BUFFER )
...@@ -725,8 +724,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -725,8 +724,7 @@ static int InitCapture( demux_t *p_demux )
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETVIDSTATUS, &p_sys->i_standard ) if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETVIDSTATUS, &p_sys->i_standard )
< 0 ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETVIDSTATUS %s", msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETVIDSTATUS %m" );
strerror(errno) );
close( p_sys->i_vfd ); close( p_sys->i_vfd );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -752,8 +750,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -752,8 +750,7 @@ static int InitCapture( demux_t *p_demux )
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_RXGETAUDRATE, &i_rate ) < 0 ) if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_RXGETAUDRATE, &i_rate ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETAUDRATE %s", msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETAUDRATE %m" );
strerror(errno) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
switch ( i_rate ) switch ( i_rate )
...@@ -841,7 +838,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -841,7 +838,7 @@ static int InitCapture( demux_t *p_demux )
PROT_READ, MAP_SHARED, p_sys->i_afd, PROT_READ, MAP_SHARED, p_sys->i_afd,
i * i_bufmemsize )) == MAP_FAILED ) i * i_bufmemsize )) == MAP_FAILED )
{ {
msg_Err( p_demux, "couldn't mmap(%d): %s", i, strerror(errno) ); msg_Err( p_demux, "couldn't mmap(%d): %m", i );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
...@@ -895,7 +892,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -895,7 +892,7 @@ static int InitCapture( demux_t *p_demux )
PROT_READ, MAP_SHARED, p_sys->i_vfd, PROT_READ, MAP_SHARED, p_sys->i_vfd,
i * i_bufmemsize )) == MAP_FAILED ) i * i_bufmemsize )) == MAP_FAILED )
{ {
msg_Err( p_demux, "couldn't mmap(%d): %s", i, strerror(errno) ); msg_Err( p_demux, "couldn't mmap(%d): %m", i );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
...@@ -941,7 +938,7 @@ static int Capture( demux_t *p_demux ) ...@@ -941,7 +938,7 @@ static int Capture( demux_t *p_demux )
if ( poll( pfd, 1 + (p_sys->i_max_channel != -1), READ_TIMEOUT ) < 0 ) if ( poll( pfd, 1 + (p_sys->i_max_channel != -1), READ_TIMEOUT ) < 0 )
{ {
msg_Warn( p_demux, "couldn't poll(): %s", strerror(errno) ); msg_Warn( p_demux, "couldn't poll(): %m" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -950,8 +947,7 @@ static int Capture( demux_t *p_demux ) ...@@ -950,8 +947,7 @@ static int Capture( demux_t *p_demux )
unsigned int i_val; unsigned int i_val;
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETEVENTS, &i_val ) < 0 ) if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS %s", msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_RXGETEVENTS %m" );
strerror(errno) );
else else
{ {
if ( i_val & SDIVIDEO_EVENT_RX_BUFFER ) if ( i_val & SDIVIDEO_EVENT_RX_BUFFER )
...@@ -975,8 +971,7 @@ static int Capture( demux_t *p_demux ) ...@@ -975,8 +971,7 @@ static int Capture( demux_t *p_demux )
unsigned int i_val; unsigned int i_val;
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_RXGETEVENTS, &i_val ) < 0 ) if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETEVENTS %s", msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_RXGETEVENTS %m" );
strerror(errno) );
else else
{ {
if ( i_val & SDIAUDIO_EVENT_RX_BUFFER ) if ( i_val & SDIAUDIO_EVENT_RX_BUFFER )
...@@ -999,8 +994,7 @@ static int Capture( demux_t *p_demux ) ...@@ -999,8 +994,7 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_DQBUF, p_sys->i_current_vbuffer ) if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_DQBUF, p_sys->i_current_vbuffer )
< 0 ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_DQBUF %s", msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_DQBUF %m" );
strerror(errno) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1010,8 +1004,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1010,8 +1004,7 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_QBUF, p_sys->i_current_vbuffer ) if ( ioctl( p_sys->i_vfd, SDIVIDEO_IOC_QBUF, p_sys->i_current_vbuffer )
< 0 ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_QBUF %s", msg_Warn( p_demux, "couldn't SDIVIDEO_IOC_QBUF %m" );
strerror(errno) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1024,7 +1017,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1024,7 +1017,7 @@ static int Capture( demux_t *p_demux )
if ( read( p_sys->i_vfd, p_buffer, p_sys->i_vbuffer_size ) < 0 ) if ( read( p_sys->i_vfd, p_buffer, p_sys->i_vbuffer_size ) < 0 )
{ {
msg_Warn( p_demux, "couldn't read %s", strerror(errno) ); msg_Warn( p_demux, "couldn't read %m" );
free( p_buffer ); free( p_buffer );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1044,8 +1037,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1044,8 +1037,7 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_DQBUF, p_sys->i_current_abuffer ) if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_DQBUF, p_sys->i_current_abuffer )
< 0 ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_DQBUF %s", msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_DQBUF %m" );
strerror(errno) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1055,8 +1047,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1055,8 +1047,7 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_QBUF, p_sys->i_current_abuffer ) if ( ioctl( p_sys->i_afd, SDIAUDIO_IOC_QBUF, p_sys->i_current_abuffer )
< 0 ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_QBUF %s", msg_Warn( p_demux, "couldn't SDIAUDIO_IOC_QBUF %m" );
strerror(errno) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1069,7 +1060,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1069,7 +1060,7 @@ static int Capture( demux_t *p_demux )
if ( read( p_sys->i_afd, p_buffer, p_sys->i_abuffer_size ) < 0 ) if ( read( p_sys->i_afd, p_buffer, p_sys->i_abuffer_size ) < 0 )
{ {
msg_Warn( p_demux, "couldn't read %s", strerror(errno) ); msg_Warn( p_demux, "couldn't read %m" );
free( p_buffer ); free( p_buffer );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
modules/access/linsys/linsys_sdi.c
View file @ e2df0a99
...@@ -1768,7 +1768,7 @@ static int InitCapture( demux_t *p_demux ) ...@@ -1768,7 +1768,7 @@ static int InitCapture( demux_t *p_demux )
PROT_READ, MAP_SHARED, p_sys->i_fd, PROT_READ, MAP_SHARED, p_sys->i_fd,
i * i_bufmemsize )) == MAP_FAILED ) i * i_bufmemsize )) == MAP_FAILED )
{ {
msg_Err( p_demux, "couldn't mmap(%d): %s", i, strerror(errno) ); msg_Err( p_demux, "couldn't mmap(%d): %m", i );
free( p_sys->pp_buffers ); free( p_sys->pp_buffers );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1798,7 +1798,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1798,7 +1798,7 @@ static int Capture( demux_t *p_demux )
if ( poll( &pfd, 1, READ_TIMEOUT ) < 0 ) if ( poll( &pfd, 1, READ_TIMEOUT ) < 0 )
{ {
msg_Warn( p_demux, "couldn't poll(): %s", strerror(errno) ); msg_Warn( p_demux, "couldn't poll(): %m" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1807,7 +1807,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1807,7 +1807,7 @@ static int Capture( demux_t *p_demux )
unsigned int i_val; unsigned int i_val;
if ( ioctl( p_sys->i_fd, SDI_IOC_RXGETEVENTS, &i_val ) < 0 ) if ( ioctl( p_sys->i_fd, SDI_IOC_RXGETEVENTS, &i_val ) < 0 )
msg_Warn( p_demux, "couldn't SDI_IOC_RXGETEVENTS %s", strerror(errno) ); msg_Warn( p_demux, "couldn't SDI_IOC_RXGETEVENTS %m" );
else else
{ {
if ( i_val & SDI_EVENT_RX_BUFFER ) if ( i_val & SDI_EVENT_RX_BUFFER )
...@@ -1827,7 +1827,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1827,7 +1827,7 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_fd, SDI_IOC_DQBUF, p_sys->i_current_buffer ) < 0 ) if ( ioctl( p_sys->i_fd, SDI_IOC_DQBUF, p_sys->i_current_buffer ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDI_IOC_DQBUF %s", strerror(errno) ); msg_Warn( p_demux, "couldn't SDI_IOC_DQBUF %m" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1837,7 +1837,7 @@ static int Capture( demux_t *p_demux ) ...@@ -1837,7 +1837,7 @@ static int Capture( demux_t *p_demux )
if ( ioctl( p_sys->i_fd, SDI_IOC_QBUF, p_sys->i_current_buffer ) < 0 ) if ( ioctl( p_sys->i_fd, SDI_IOC_QBUF, p_sys->i_current_buffer ) < 0 )
{ {
msg_Warn( p_demux, "couldn't SDI_IOC_QBUF %s", strerror(errno) ); msg_Warn( p_demux, "couldn't SDI_IOC_QBUF %m" );
return VLC_EGENERIC; 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