generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move resolve_host from tcp.c to os_support.c as it is used widely

Browse Source 
Originally committed as revision 8834 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2007-04-26 18:04:42 +00:00
parent a33cc9511b
commit 383eda2348
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/os_support.c
View File

@ -71,10 +71,12 @@ struct tm *localtime_r(const time_t *t, struct tm *tp)
} }
#endif /* !defined(HAVE_LOCALTIME_R) */ #endif /* !defined(HAVE_LOCALTIME_R) */
#if !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) #ifdef CONFIG_NETWORK
#include "network.h"
#if !defined(HAVE_INET_ATON)
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include "network.h"
int inet_aton (const char * str, struct in_addr * add) int inet_aton (const char * str, struct in_addr * add)
{ {
@ -97,7 +99,22 @@ done:
return 1; return 1;
} }
#endif /* !defined(HAVE_INET_ATON) && defined(CONFIG_NETWORK) */ #endif /* !defined(HAVE_INET_ATON) */
/* resolve host with also IP address parsing */
int resolve_host(struct in_addr *sin_addr, const char *hostname)
{
struct hostent *hp;
if (!inet_aton(hostname, sin_addr)) {
hp = gethostbyname(hostname);
if (!hp)
return -1;
memcpy(sin_addr, hp->h_addr, sizeof(struct in_addr));
}
return 0;
}
#endif /* CONFIG_NETWORK */
#ifdef CONFIG_FFSERVER #ifdef CONFIG_FFSERVER
#ifndef HAVE_SYS_POLL_H #ifndef HAVE_SYS_POLL_H

14
libavformat/tcp.c
View File

@ -28,20 +28,6 @@ typedef struct TCPContext {
int fd; int fd;
} TCPContext; } TCPContext;
/* resolve host with also IP address parsing */
int resolve_host(struct in_addr *sin_addr, const char *hostname)
{
struct hostent *hp;
if (!inet_aton(hostname, sin_addr)) {
hp = gethostbyname(hostname);
if (!hp)
return -1;
memcpy(sin_addr, hp->h_addr, sizeof(struct in_addr));
}
return 0;
}
/* return non zero if error */ /* return non zero if error */
static int tcp_open(URLContext *h, const char *uri, int flags) static int tcp_open(URLContext *h, const char *uri, int flags)
{ {