From 7c823d8b7f4ad7cb7da0152ce644108cb22dd854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 22 Jan 2010 16:10:08 +0000 Subject: =?UTF-8?q?Rename=20a=20function=20which=20is=20no=20longer=20ipv6?= =?UTF-8?q?-specific.=20Patch=20by=20Martin=20Storsj=C3=B6=20<$firstname?= =?UTF-8?q?=20()=20$firstname=20st>.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 21382 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/udp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/udp.c') diff --git a/libavformat/udp.c b/libavformat/udp.c index c9560564e8..9c21023672 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -135,7 +135,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) { return 0; } -static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) { +static struct addrinfo* udp_resolve_host(const char *hostname, int port, int type, int family, int flags) { struct addrinfo hints, *res = 0; int error; char sport[16]; @@ -153,7 +153,7 @@ static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, in hints.ai_family = family; hints.ai_flags = flags; if ((error = getaddrinfo(node, service, &hints, &res))) { - av_log(NULL, AV_LOG_ERROR, "udp_ipv6_resolve_host: %s\n", gai_strerror(error)); + av_log(NULL, AV_LOG_ERROR, "udp_resolve_host: %s\n", gai_strerror(error)); } return res; @@ -163,7 +163,7 @@ static int udp_set_url(struct sockaddr_storage *addr, const char *hostname, int struct addrinfo *res0; int addr_len; - res0 = udp_ipv6_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); + res0 = udp_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); if (res0 == 0) return AVERROR(EIO); memcpy(addr, res0->ai_addr, res0->ai_addrlen); addr_len = res0->ai_addrlen; @@ -194,7 +194,7 @@ static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr, int * if (((struct sockaddr *) &s->dest_addr)->sa_family) family = ((struct sockaddr *) &s->dest_addr)->sa_family; - res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); + res0 = udp_resolve_host(0, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); if (res0 == 0) goto fail; for (res = res0; res; res=res->ai_next) { -- cgit v1.2.3