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
bd3f6bbb
Commit
bd3f6bbb
authored
Feb 27, 2007
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplification
parent
bd056290
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
9 deletions
+4
-9
src/network/io.c
src/network/io.c
+4
-9
No files found.
src/network/io.c
View file @
bd3f6bbb
...
@@ -268,8 +268,7 @@ int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
...
@@ -268,8 +268,7 @@ int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
static
ssize_t
static
ssize_t
net_ReadInner
(
vlc_object_t
*
restrict
p_this
,
unsigned
fdc
,
const
int
*
fdv
,
net_ReadInner
(
vlc_object_t
*
restrict
p_this
,
unsigned
fdc
,
const
int
*
fdv
,
const
v_socket_t
*
const
*
restrict
vsv
,
const
v_socket_t
*
const
*
restrict
vsv
,
uint8_t
*
restrict
p_buf
,
size_t
i_buflen
,
uint8_t
*
restrict
p_buf
,
size_t
i_buflen
,
vlc_bool_t
waitall
)
vlc_bool_t
dontwait
,
vlc_bool_t
waitall
)
{
{
size_t
i_total
=
0
;
size_t
i_total
=
0
;
...
@@ -335,11 +334,7 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
...
@@ -335,11 +334,7 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
}
}
else
else
{
{
#if defined(WIN32) || defined(UNDER_CE)
n
=
recv
(
*
fdv
,
p_buf
,
i_buflen
,
0
);
n
=
recv
(
*
fdv
,
p_buf
,
i_buflen
,
0
);
#else
n
=
read
(
*
fdv
,
p_buf
,
i_buflen
);
#endif
}
}
if
(
n
==
-
1
)
if
(
n
==
-
1
)
...
@@ -376,7 +371,7 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
...
@@ -376,7 +371,7 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
p_buf
+=
n
;
p_buf
+=
n
;
i_buflen
-=
n
;
i_buflen
-=
n
;
if
((
n
==
0
)
||
dontwait
||
!
waitall
)
if
((
n
==
0
)
||
!
waitall
)
break
;
break
;
}
}
return
i_total
;
return
i_total
;
...
@@ -400,7 +395,7 @@ ssize_t __net_Read( vlc_object_t *restrict p_this, int fd,
...
@@ -400,7 +395,7 @@ ssize_t __net_Read( vlc_object_t *restrict p_this, int fd,
{
{
return
net_ReadInner
(
p_this
,
1
,
&
(
int
){
fd
},
return
net_ReadInner
(
p_this
,
1
,
&
(
int
){
fd
},
&
(
const
v_socket_t
*
){
p_vs
},
&
(
const
v_socket_t
*
){
p_vs
},
buf
,
len
,
VLC_FALSE
,
b_retry
);
buf
,
len
,
b_retry
);
}
}
...
@@ -417,7 +412,7 @@ ssize_t __net_Select( vlc_object_t *restrict p_this,
...
@@ -417,7 +412,7 @@ ssize_t __net_Select( vlc_object_t *restrict p_this,
memset
(
vsv
,
0
,
sizeof
(
vsv
)
);
memset
(
vsv
,
0
,
sizeof
(
vsv
)
);
return
net_ReadInner
(
p_this
,
nfd
,
fds
,
vsv
,
return
net_ReadInner
(
p_this
,
nfd
,
fds
,
vsv
,
buf
,
len
,
VLC_FALSE
,
VLC_FALSE
);
buf
,
len
,
VLC_FALSE
);
}
}
...
...
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