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
7d28f8a2
Commit
7d28f8a2
authored
May 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
network: remove useless vlc_object_waitpipe() call in net_Accept()
None of the call sites use the input thread and wait pipe.
parent
a0391a08
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
13 deletions
+4
-13
src/network/tcp.c
src/network/tcp.c
+4
-13
No files found.
src/network/tcp.c
View file @
7d28f8a2
...
@@ -270,26 +270,23 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd)
...
@@ -270,26 +270,23 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd)
*/
*/
int
net_Accept
(
vlc_object_t
*
p_this
,
int
*
pi_fd
)
int
net_Accept
(
vlc_object_t
*
p_this
,
int
*
pi_fd
)
{
{
int
evfd
=
vlc_object_waitpipe
(
p_this
);
assert
(
pi_fd
!=
NULL
);
assert
(
pi_fd
!=
NULL
);
unsigned
n
=
0
;
unsigned
n
=
0
;
while
(
pi_fd
[
n
]
!=
-
1
)
while
(
pi_fd
[
n
]
!=
-
1
)
n
++
;
n
++
;
struct
pollfd
ufd
[
n
+
1
];
struct
pollfd
ufd
[
n
];
/* Initialize file descriptor set */
/* Initialize file descriptor set */
for
(
unsigned
i
=
0
;
i
<
=
n
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
n
;
i
++
)
{
{
ufd
[
i
].
fd
=
(
i
<
n
)
?
pi_fd
[
i
]
:
evfd
;
ufd
[
i
].
fd
=
pi_fd
[
i
]
;
ufd
[
i
].
events
=
POLLIN
;
ufd
[
i
].
events
=
POLLIN
;
}
}
ufd
[
n
].
revents
=
0
;
for
(;;)
for
(;;)
{
{
while
(
poll
(
ufd
,
n
+
(
evfd
!=
-
1
)
,
-
1
)
==
-
1
)
while
(
poll
(
ufd
,
n
,
-
1
)
==
-
1
)
{
{
if
(
net_errno
!=
EINTR
)
if
(
net_errno
!=
EINTR
)
{
{
...
@@ -316,12 +313,6 @@ int net_Accept (vlc_object_t *p_this, int *pi_fd)
...
@@ -316,12 +313,6 @@ int net_Accept (vlc_object_t *p_this, int *pi_fd)
pi_fd
[
n
-
1
]
=
sfd
;
pi_fd
[
n
-
1
]
=
sfd
;
return
fd
;
return
fd
;
}
}
if
(
ufd
[
n
].
revents
)
{
errno
=
EINTR
;
break
;
}
}
}
return
-
1
;
return
-
1
;
}
}
...
...
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