Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
b19adbaf
Commit
b19adbaf
authored
Oct 06, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strerror(errno) is not thread-safe, use %m
parent
e974af6d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
14 deletions
+12
-14
modules/gui/fbosd.c
modules/gui/fbosd.c
+2
-2
modules/video_filter/dynamicoverlay/dynamicoverlay.c
modules/video_filter/dynamicoverlay/dynamicoverlay.c
+6
-8
modules/video_output/omapfb.c
modules/video_output/omapfb.c
+4
-4
No files found.
modules/gui/fbosd.c
View file @
b19adbaf
...
@@ -1062,7 +1062,7 @@ static int OpenDisplay( intf_thread_t *p_intf )
...
@@ -1062,7 +1062,7 @@ static int OpenDisplay( intf_thread_t *p_intf )
p_sys
->
i_fd
=
open
(
psz_device
,
O_RDWR
);
p_sys
->
i_fd
=
open
(
psz_device
,
O_RDWR
);
if
(
p_sys
->
i_fd
==
-
1
)
if
(
p_sys
->
i_fd
==
-
1
)
{
{
msg_Err
(
p_intf
,
"cannot open %s (%
s)"
,
psz_device
,
strerror
(
errno
)
);
msg_Err
(
p_intf
,
"cannot open %s (%
m)"
,
psz_device
);
free
(
psz_device
);
free
(
psz_device
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -1071,7 +1071,7 @@ static int OpenDisplay( intf_thread_t *p_intf )
...
@@ -1071,7 +1071,7 @@ static int OpenDisplay( intf_thread_t *p_intf )
/* Get framebuffer device information */
/* Get framebuffer device information */
if
(
ioctl
(
p_sys
->
i_fd
,
FBIOGET_VSCREENINFO
,
&
p_sys
->
var_info
)
)
if
(
ioctl
(
p_sys
->
i_fd
,
FBIOGET_VSCREENINFO
,
&
p_sys
->
var_info
)
)
{
{
msg_Err
(
p_intf
,
"cannot get fb info (%
s)"
,
strerror
(
errno
)
);
msg_Err
(
p_intf
,
"cannot get fb info (%
m)"
);
close
(
p_sys
->
i_fd
);
close
(
p_sys
->
i_fd
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
...
modules/video_filter/dynamicoverlay/dynamicoverlay.c
View file @
b19adbaf
...
@@ -173,8 +173,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
...
@@ -173,8 +173,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
p_sys
->
i_inputfd
=
open
(
p_sys
->
psz_inputfile
,
O_RDONLY
|
O_NONBLOCK
);
p_sys
->
i_inputfd
=
open
(
p_sys
->
psz_inputfile
,
O_RDONLY
|
O_NONBLOCK
);
if
(
p_sys
->
i_inputfd
==
-
1
)
if
(
p_sys
->
i_inputfd
==
-
1
)
{
{
msg_Warn
(
p_filter
,
"Failed to grab input file: %s (%
s
)"
,
msg_Warn
(
p_filter
,
"Failed to grab input file: %s (%
m
)"
,
p_sys
->
psz_inputfile
,
strerror
(
errno
)
);
p_sys
->
psz_inputfile
);
}
}
else
else
{
{
...
@@ -191,8 +191,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
...
@@ -191,8 +191,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
{
{
if
(
errno
!=
ENXIO
)
if
(
errno
!=
ENXIO
)
{
{
msg_Warn
(
p_filter
,
"Failed to grab output file: %s (%
s
)"
,
msg_Warn
(
p_filter
,
"Failed to grab output file: %s (%
m
)"
,
p_sys
->
psz_outputfile
,
strerror
(
errno
)
);
p_sys
->
psz_outputfile
);
}
}
}
}
else
else
...
@@ -213,8 +213,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
...
@@ -213,8 +213,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
/* We hit an error */
/* We hit an error */
if
(
errno
!=
EAGAIN
)
if
(
errno
!=
EAGAIN
)
{
{
msg_Warn
(
p_filter
,
"Error on input file: %s"
,
msg_Warn
(
p_filter
,
"Error on input file: %m"
);
strerror
(
errno
)
);
close
(
p_sys
->
i_inputfd
);
close
(
p_sys
->
i_inputfd
);
p_sys
->
i_inputfd
=
-
1
;
p_sys
->
i_inputfd
=
-
1
;
}
}
...
@@ -321,8 +320,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
...
@@ -321,8 +320,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
/* We hit an error */
/* We hit an error */
if
(
errno
!=
EAGAIN
)
if
(
errno
!=
EAGAIN
)
{
{
msg_Warn
(
p_filter
,
"Error on output file: %s"
,
msg_Warn
(
p_filter
,
"Error on output file: %m"
);
strerror
(
errno
)
);
close
(
p_sys
->
i_outputfd
);
close
(
p_sys
->
i_outputfd
);
p_sys
->
i_outputfd
=
-
1
;
p_sys
->
i_outputfd
=
-
1
;
}
}
...
...
modules/video_output/omapfb.c
View file @
b19adbaf
...
@@ -478,13 +478,13 @@ static int OpenDisplay( vout_thread_t *p_vout )
...
@@ -478,13 +478,13 @@ static int OpenDisplay( vout_thread_t *p_vout )
if
(
ioctl
(
p_sys
->
i_fd
,
FBIOGET_VSCREENINFO
,
&
p_sys
->
fb_vinfo
)
)
if
(
ioctl
(
p_sys
->
i_fd
,
FBIOGET_VSCREENINFO
,
&
p_sys
->
fb_vinfo
)
)
{
{
msg_Err
(
p_vout
,
"Can't get VSCREENINFO: %
s"
,
strerror
(
errno
)
);
msg_Err
(
p_vout
,
"Can't get VSCREENINFO: %
m"
);
close
(
p_sys
->
i_fd
);
close
(
p_sys
->
i_fd
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
if
(
ioctl
(
p_sys
->
i_fd
,
FBIOGET_FSCREENINFO
,
&
p_sys
->
fb_finfo
)
)
if
(
ioctl
(
p_sys
->
i_fd
,
FBIOGET_FSCREENINFO
,
&
p_sys
->
fb_finfo
)
)
{
{
msg_Err
(
p_vout
,
"Can't get FSCREENINFO: %
s"
,
strerror
(
errno
)
);
msg_Err
(
p_vout
,
"Can't get FSCREENINFO: %
m"
);
close
(
p_sys
->
i_fd
);
close
(
p_sys
->
i_fd
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -496,7 +496,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
...
@@ -496,7 +496,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
if
(
(
p_sys
->
p_video
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
if
(
(
p_sys
->
p_video
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
MAP_SHARED
,
p_sys
->
i_fd
,
0
))
==
MAP_FAILED
)
p_sys
->
i_fd
,
0
))
==
MAP_FAILED
)
{
{
msg_Err
(
p_vout
,
"Can't mmap: %
s"
,
strerror
(
errno
)
);
msg_Err
(
p_vout
,
"Can't mmap: %
m"
);
close
(
p_sys
->
i_fd
);
close
(
p_sys
->
i_fd
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -516,7 +516,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
...
@@ -516,7 +516,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
if
(
(
p_sys
->
p_null
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
if
(
(
p_sys
->
p_null
=
(
uint8_t
*
)
mmap
(
0
,
p_sys
->
i_page_size
,
PROT_READ
|
PROT_WRITE
,
MAP_PRIVATE
,
p_sys
->
i_null_fd
,
0
))
==
MAP_FAILED
)
MAP_PRIVATE
,
p_sys
->
i_null_fd
,
0
))
==
MAP_FAILED
)
{
{
msg_Err
(
p_vout
,
"Can't mmap 2: %
s"
,
strerror
(
errno
)
);
msg_Err
(
p_vout
,
"Can't mmap 2: %
m"
);
munmap
(
p_sys
->
p_video
,
p_sys
->
i_page_size
);
munmap
(
p_sys
->
p_video
,
p_sys
->
i_page_size
);
close
(
p_sys
->
i_null_fd
);
close
(
p_sys
->
i_null_fd
);
close
(
p_sys
->
i_fd
);
close
(
p_sys
->
i_fd
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment