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
9b629ed2
Commit
9b629ed2
authored
May 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove no longer used net_vaPrintf() argument
parent
217fc59f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
include/vlc_network.h
include/vlc_network.h
+2
-2
modules/control/oldrc.c
modules/control/oldrc.c
+1
-1
src/network/io.c
src/network/io.c
+3
-3
No files found.
include/vlc_network.h
View file @
9b629ed2
...
@@ -153,8 +153,8 @@ VLC_API char * net_Gets( vlc_object_t *p_this, int fd );
...
@@ -153,8 +153,8 @@ VLC_API char * net_Gets( vlc_object_t *p_this, int fd );
VLC_API
ssize_t
net_Printf
(
vlc_object_t
*
p_this
,
int
fd
,
const
char
*
psz_fmt
,
...
)
VLC_FORMAT
(
3
,
4
);
VLC_API
ssize_t
net_Printf
(
vlc_object_t
*
p_this
,
int
fd
,
const
char
*
psz_fmt
,
...
)
VLC_FORMAT
(
3
,
4
);
#define net_Printf(o,fd,...) net_Printf(VLC_OBJECT(o),fd, __VA_ARGS__)
#define net_Printf(o,fd,...) net_Printf(VLC_OBJECT(o),fd, __VA_ARGS__)
VLC_API
ssize_t
net_vaPrintf
(
vlc_object_t
*
p_this
,
int
fd
,
const
v_socket_t
*
,
const
char
*
psz_fmt
,
va_list
args
);
VLC_API
ssize_t
net_vaPrintf
(
vlc_object_t
*
p_this
,
int
fd
,
const
char
*
psz_fmt
,
va_list
args
);
#define net_vaPrintf(a,b,c,d
,e) net_vaPrintf(VLC_OBJECT(a),b,c,d,e
)
#define net_vaPrintf(a,b,c,d
) net_vaPrintf(VLC_OBJECT(a),b,c,d
)
#ifdef _WIN32
#ifdef _WIN32
/* Microsoft: same semantic, same value, different name... go figure */
/* Microsoft: same semantic, same value, different name... go figure */
...
...
modules/control/oldrc.c
View file @
9b629ed2
...
@@ -149,7 +149,7 @@ static void msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
...
@@ -149,7 +149,7 @@ static void msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
if
(
p_intf
->
p_sys
->
i_socket
==
-
1
)
if
(
p_intf
->
p_sys
->
i_socket
==
-
1
)
utf8_vfprintf
(
stdout
,
fmt_eol
,
args
);
utf8_vfprintf
(
stdout
,
fmt_eol
,
args
);
else
else
net_vaPrintf
(
p_intf
,
p_intf
->
p_sys
->
i_socket
,
NULL
,
fmt_eol
,
args
);
net_vaPrintf
(
p_intf
,
p_intf
->
p_sys
->
i_socket
,
fmt_eol
,
args
);
va_end
(
args
);
va_end
(
args
);
}
}
#define msg_rc( ... ) msg_rc( p_intf, __VA_ARGS__ )
#define msg_rc( ... ) msg_rc( p_intf, __VA_ARGS__ )
...
...
src/network/io.c
View file @
9b629ed2
...
@@ -510,14 +510,14 @@ ssize_t net_Printf( vlc_object_t *p_this, int fd, const char *psz_fmt, ... )
...
@@ -510,14 +510,14 @@ ssize_t net_Printf( vlc_object_t *p_this, int fd, const char *psz_fmt, ... )
int
i_ret
;
int
i_ret
;
va_list
args
;
va_list
args
;
va_start
(
args
,
psz_fmt
);
va_start
(
args
,
psz_fmt
);
i_ret
=
net_vaPrintf
(
p_this
,
fd
,
NULL
,
psz_fmt
,
args
);
i_ret
=
net_vaPrintf
(
p_this
,
fd
,
psz_fmt
,
args
);
va_end
(
args
);
va_end
(
args
);
return
i_ret
;
return
i_ret
;
}
}
#undef net_vaPrintf
#undef net_vaPrintf
ssize_t
net_vaPrintf
(
vlc_object_t
*
p_this
,
int
fd
,
const
v_socket_t
*
p_vs
,
ssize_t
net_vaPrintf
(
vlc_object_t
*
p_this
,
int
fd
,
const
char
*
psz_fmt
,
va_list
args
)
const
char
*
psz_fmt
,
va_list
args
)
{
{
char
*
psz
;
char
*
psz
;
...
@@ -526,7 +526,7 @@ ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
...
@@ -526,7 +526,7 @@ ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
int
i_size
=
vasprintf
(
&
psz
,
psz_fmt
,
args
);
int
i_size
=
vasprintf
(
&
psz
,
psz_fmt
,
args
);
if
(
i_size
==
-
1
)
if
(
i_size
==
-
1
)
return
-
1
;
return
-
1
;
i_ret
=
net_Write
(
p_this
,
fd
,
p_vs
,
psz
,
i_size
)
<
i_size
i_ret
=
net_Write
(
p_this
,
fd
,
NULL
,
psz
,
i_size
)
<
i_size
?
-
1
:
i_size
;
?
-
1
:
i_size
;
free
(
psz
);
free
(
psz
);
...
...
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