[Ffmpeg-cvslog] r8834 - in trunk/libavformat: os_support.c tcp.c

[alex]

Author: alex
Date: Thu Apr 26 20:04:42 2007
New Revision: 8834

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

Modified:
   trunk/libavformat/os_support.c
   trunk/libavformat/tcp.c

Modified: trunk/libavformat/os_support.c
==============================================================================
--- trunk/libavformat/os_support.c	(original)
+++ trunk/libavformat/os_support.c	Thu Apr 26 20:04:42 2007
@@ -71,10 +71,12 @@ struct tm *localtime_r(const time_t *t, 
 }
 #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 <strings.h>
-#include "network.h"
 
 int inet_aton (const char * str, struct in_addr * add)
 {
@@ -97,7 +99,22 @@ done:
 
     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
 #ifndef HAVE_SYS_POLL_H

Modified: trunk/libavformat/tcp.c
==============================================================================
--- trunk/libavformat/tcp.c	(original)
+++ trunk/libavformat/tcp.c	Thu Apr 26 20:04:42 2007
@@ -28,20 +28,6 @@ typedef struct TCPContext {
     int fd;
 } 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 */
 static int tcp_open(URLContext *h, const char *uri, int flags)
 {