Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
6cf8fa76
Commit
6cf8fa76
authored
Jan 21, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary complication
parent
cc227c72
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
12 deletions
+1
-12
src/misc/objects.c
src/misc/objects.c
+1
-12
No files found.
src/misc/objects.c
View file @
6cf8fa76
...
...
@@ -567,11 +567,7 @@ vlc_bool_t __vlc_object_wait( vlc_object_t *obj )
int
fd
=
obj
->
p_internals
->
pipes
[
0
];
if
(
fd
!=
-
1
)
{
if
(
read
(
fd
,
&
(
char
){
0
},
1
)
==
0
)
{
close
(
fd
);
obj
->
p_internals
->
pipes
[
1
]
=
-
1
;
}
while
(
read
(
fd
,
&
(
char
){
0
},
1
<
0
));
return
obj
->
b_die
;
}
...
...
@@ -660,13 +656,6 @@ void __vlc_object_kill( vlc_object_t *p_this )
for
(
int
i
=
0
;
i
<
p_this
->
i_children
;
i
++
)
vlc_object_kill
(
p_this
->
pp_children
[
i
]
);
int
fd
=
p_this
->
p_internals
->
pipes
[
1
];
if
(
fd
!=
-
1
)
{
close
(
fd
);
/* closing a pipe makes it readable too */
p_this
->
p_internals
->
pipes
[
1
]
=
-
1
;
}
vlc_object_signal_unlocked
(
p_this
);
vlc_mutex_unlock
(
&
p_this
->
object_lock
);
}
...
...
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