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
8abe3082
Commit
8abe3082
authored
Apr 28, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless freeaddrinfo wrapper
parent
95a84cda
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
21 deletions
+14
-21
include/vlc_network.h
include/vlc_network.h
+0
-1
modules/stream_out/standard.c
modules/stream_out/standard.c
+2
-2
src/libvlccore.sym
src/libvlccore.sym
+0
-1
src/network/acl.c
src/network/acl.c
+2
-2
src/network/getaddrinfo.c
src/network/getaddrinfo.c
+1
-6
src/network/io.c
src/network/io.c
+1
-1
src/network/tcp.c
src/network/tcp.c
+2
-2
src/network/udp.c
src/network/udp.c
+5
-5
src/stream_output/announce.c
src/stream_output/announce.c
+1
-1
No files found.
include/vlc_network.h
View file @
8abe3082
...
...
@@ -227,7 +227,6 @@ VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout));
VLC_EXPORT
(
int
,
vlc_getnameinfo
,
(
const
struct
sockaddr
*
,
int
,
char
*
,
int
,
int
*
,
int
)
);
VLC_EXPORT
(
int
,
vlc_getaddrinfo
,
(
vlc_object_t
*
,
const
char
*
,
int
,
const
struct
addrinfo
*
,
struct
addrinfo
**
)
);
VLC_EXPORT
(
void
,
vlc_freeaddrinfo
,
(
struct
addrinfo
*
)
);
static
inline
bool
...
...
modules/stream_out/standard.c
View file @
8abe3082
...
...
@@ -438,13 +438,13 @@ static int Open( vlc_object_t *p_this )
if
(
vlc_getaddrinfo
(
VLC_OBJECT
(
p_stream
),
dhost
,
dport
,
&
hints
,
&
res
)
==
0
)
{
memcpy
(
&
dst
,
res
->
ai_addr
,
dstlen
=
res
->
ai_addrlen
);
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
}
if
(
vlc_getaddrinfo
(
VLC_OBJECT
(
p_stream
),
shost
,
sport
,
&
hints
,
&
res
)
==
0
)
{
memcpy
(
&
src
,
res
->
ai_addr
,
srclen
=
res
->
ai_addrlen
);
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
}
char
*
head
=
vlc_sdp_Start
(
VLC_OBJECT
(
p_stream
),
SOUT_CFG_PREFIX
,
...
...
src/libvlccore.sym
View file @
8abe3082
...
...
@@ -502,7 +502,6 @@ vlc_event_manager_register_event_type
vlc_event_send
vlc_execve
vlc_fastmem_register
vlc_freeaddrinfo
vlc_fourcc_GetCodec
vlc_fourcc_GetCodecAudio
vlc_fourcc_GetCodecFromString
...
...
src/network/acl.c
View file @
8abe3082
...
...
@@ -99,11 +99,11 @@ static int ACL_Resolve( vlc_object_t *p_this, uint8_t *p_bytes,
default:
msg_Err
(
p_this
,
"unknown address family"
);
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
return
-
1
;
}
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
return
i_family
;
}
...
...
src/network/getaddrinfo.c
View file @
8abe3082
...
...
@@ -79,7 +79,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen,
* @param res pointer set to the resulting chained list.
* @return 0 on success, a getaddrinfo() error otherwise.
* On failure, *res is undefined. On success, it must be freed with
*
vlc_
freeaddrinfo().
* freeaddrinfo().
*/
int
vlc_getaddrinfo
(
vlc_object_t
*
p_this
,
const
char
*
node
,
int
i_port
,
const
struct
addrinfo
*
p_hints
,
...
...
@@ -202,11 +202,6 @@ out:
}
void
vlc_freeaddrinfo
(
struct
addrinfo
*
infos
)
{
freeaddrinfo
(
infos
);
}
/**
* inet_pton() replacement
*/
...
...
src/network/io.c
View file @
8abe3082
...
...
@@ -235,7 +235,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
net_Close
(
fd
);
}
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
if
(
sockv
!=
NULL
)
sockv
[
sockc
]
=
-
1
;
...
...
src/network/tcp.c
View file @
8abe3082
...
...
@@ -215,7 +215,7 @@ next_ai: /* failure */
continue
;
}
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
if
(
i_handle
==
-
1
)
return
-
1
;
...
...
@@ -459,7 +459,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
SetWBE
(
&
buffer
[
2
],
i_port
);
/* Port */
memcpy
(
&
buffer
[
4
],
/* Address */
&
((
struct
sockaddr_in
*
)(
p_res
->
ai_addr
))
->
sin_addr
,
4
);
vlc_
freeaddrinfo
(
p_res
);
freeaddrinfo
(
p_res
);
buffer
[
8
]
=
0
;
/* Empty user id */
...
...
src/network/udp.c
View file @
8abe3082
...
...
@@ -203,7 +203,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
break
;
}
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
return
val
;
}
...
...
@@ -723,7 +723,7 @@ int net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port,
}
}
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
if
(
i_handle
==
-
1
)
{
...
...
@@ -774,7 +774,7 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
{
msg_Err
(
obj
,
"cannot resolve %s port %d : %s"
,
psz_bind
,
i_bind
,
gai_strerror
(
val
));
vlc_
freeaddrinfo
(
rem
);
freeaddrinfo
(
rem
);
return
-
1
;
}
...
...
@@ -817,8 +817,8 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
net_Close
(
fd
);
}
vlc_
freeaddrinfo
(
rem
);
vlc_
freeaddrinfo
(
loc
);
freeaddrinfo
(
rem
);
freeaddrinfo
(
loc
);
return
val
;
}
...
...
src/stream_output/announce.c
View file @
8abe3082
...
...
@@ -81,7 +81,7 @@ sout_AnnounceRegisterSDP( vlc_object_t *obj, const char *psz_sdp,
if
(
res
->
ai_addrlen
<=
sizeof
(
p_session
->
addr
))
memcpy
(
&
p_session
->
addr
,
res
->
ai_addr
,
p_session
->
addrlen
=
res
->
ai_addrlen
);
vlc_
freeaddrinfo
(
res
);
freeaddrinfo
(
res
);
}
vlc_mutex_lock
(
&
sap_mutex
);
...
...
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