Commit 8abe3082 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove useless freeaddrinfo wrapper

parent 95a84cda
...@@ -227,7 +227,6 @@ VLC_EXPORT (int, vlc_poll, (struct pollfd *fds, unsigned nfds, int timeout)); ...@@ -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_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( int, vlc_getaddrinfo, ( vlc_object_t *, const char *, int, const struct addrinfo *, struct addrinfo ** ) );
VLC_EXPORT( void, vlc_freeaddrinfo, ( struct addrinfo * ) );
static inline bool static inline bool
......
...@@ -438,13 +438,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -438,13 +438,13 @@ static int Open( vlc_object_t *p_this )
if ( vlc_getaddrinfo ( VLC_OBJECT(p_stream), dhost, dport, &hints, &res) == 0) if ( vlc_getaddrinfo ( VLC_OBJECT(p_stream), dhost, dport, &hints, &res) == 0)
{ {
memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); 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) if (vlc_getaddrinfo ( VLC_OBJECT(p_stream), shost, sport, &hints, &res) == 0)
{ {
memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); 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, char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX,
......
...@@ -502,7 +502,6 @@ vlc_event_manager_register_event_type ...@@ -502,7 +502,6 @@ vlc_event_manager_register_event_type
vlc_event_send vlc_event_send
vlc_execve vlc_execve
vlc_fastmem_register vlc_fastmem_register
vlc_freeaddrinfo
vlc_fourcc_GetCodec vlc_fourcc_GetCodec
vlc_fourcc_GetCodecAudio vlc_fourcc_GetCodecAudio
vlc_fourcc_GetCodecFromString vlc_fourcc_GetCodecFromString
......
...@@ -99,11 +99,11 @@ static int ACL_Resolve( vlc_object_t *p_this, uint8_t *p_bytes, ...@@ -99,11 +99,11 @@ static int ACL_Resolve( vlc_object_t *p_this, uint8_t *p_bytes,
default: default:
msg_Err( p_this, "unknown address family" ); msg_Err( p_this, "unknown address family" );
vlc_freeaddrinfo( res ); freeaddrinfo( res );
return -1; return -1;
} }
vlc_freeaddrinfo( res ); freeaddrinfo( res );
return i_family; return i_family;
} }
......
...@@ -79,7 +79,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen, ...@@ -79,7 +79,7 @@ int vlc_getnameinfo( const struct sockaddr *sa, int salen,
* @param res pointer set to the resulting chained list. * @param res pointer set to the resulting chained list.
* @return 0 on success, a getaddrinfo() error otherwise. * @return 0 on success, a getaddrinfo() error otherwise.
* On failure, *res is undefined. On success, it must be freed with * 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 vlc_getaddrinfo( vlc_object_t *p_this, const char *node,
int i_port, const struct addrinfo *p_hints, int i_port, const struct addrinfo *p_hints,
...@@ -202,11 +202,6 @@ out: ...@@ -202,11 +202,6 @@ out:
} }
void vlc_freeaddrinfo( struct addrinfo *infos )
{
freeaddrinfo (infos);
}
/** /**
* inet_pton() replacement * inet_pton() replacement
*/ */
......
...@@ -235,7 +235,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host, ...@@ -235,7 +235,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
net_Close (fd); net_Close (fd);
} }
vlc_freeaddrinfo (res); freeaddrinfo (res);
if (sockv != NULL) if (sockv != NULL)
sockv[sockc] = -1; sockv[sockc] = -1;
......
...@@ -215,7 +215,7 @@ next_ai: /* failure */ ...@@ -215,7 +215,7 @@ next_ai: /* failure */
continue; continue;
} }
vlc_freeaddrinfo( res ); freeaddrinfo( res );
if( i_handle == -1 ) if( i_handle == -1 )
return -1; return -1;
...@@ -459,7 +459,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj, ...@@ -459,7 +459,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
SetWBE( &buffer[2], i_port ); /* Port */ SetWBE( &buffer[2], i_port ); /* Port */
memcpy( &buffer[4], /* Address */ memcpy( &buffer[4], /* Address */
&((struct sockaddr_in *)(p_res->ai_addr))->sin_addr, 4 ); &((struct sockaddr_in *)(p_res->ai_addr))->sin_addr, 4 );
vlc_freeaddrinfo( p_res ); freeaddrinfo( p_res );
buffer[8] = 0; /* Empty user id */ buffer[8] = 0; /* Empty user id */
......
...@@ -203,7 +203,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port, ...@@ -203,7 +203,7 @@ static int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
break; break;
} }
vlc_freeaddrinfo (res); freeaddrinfo (res);
return val; return val;
} }
...@@ -723,7 +723,7 @@ int net_ConnectDgram( vlc_object_t *p_this, const char *psz_host, int i_port, ...@@ -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 ) if( i_handle == -1 )
{ {
...@@ -774,7 +774,7 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, ...@@ -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, msg_Err (obj, "cannot resolve %s port %d : %s", psz_bind, i_bind,
gai_strerror (val)); gai_strerror (val));
vlc_freeaddrinfo (rem); freeaddrinfo (rem);
return -1; return -1;
} }
...@@ -817,8 +817,8 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind, ...@@ -817,8 +817,8 @@ int net_OpenDgram( vlc_object_t *obj, const char *psz_bind, int i_bind,
net_Close (fd); net_Close (fd);
} }
vlc_freeaddrinfo (rem); freeaddrinfo (rem);
vlc_freeaddrinfo (loc); freeaddrinfo (loc);
return val; return val;
} }
......
...@@ -81,7 +81,7 @@ sout_AnnounceRegisterSDP( vlc_object_t *obj, const char *psz_sdp, ...@@ -81,7 +81,7 @@ sout_AnnounceRegisterSDP( vlc_object_t *obj, const char *psz_sdp,
if (res->ai_addrlen <= sizeof (p_session->addr)) if (res->ai_addrlen <= sizeof (p_session->addr))
memcpy (&p_session->addr, res->ai_addr, memcpy (&p_session->addr, res->ai_addr,
p_session->addrlen = res->ai_addrlen); p_session->addrlen = res->ai_addrlen);
vlc_freeaddrinfo (res); freeaddrinfo (res);
} }
vlc_mutex_lock (&sap_mutex); vlc_mutex_lock (&sap_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment