Indentation

[ffmpeg] / libavformat / os_support.c

diff --git a/libavformat/os_support.c b/libavformat/os_support.c
index b70dc2755bccab15586a56c700ecc098611ffdf4..13f82f76bb4d96ce4045008520a5510ff21f56ee 100644 (file)
--- a/libavformat/os_support.c
+++ b/libavformat/os_support.c
@@ -21,56 +21,17 @@
  */
 #include "config.h"
 #include "avformat.h"
-#if defined(__MINGW32__)
-#include <sys/types.h>
-#include <sys/timeb.h>
-#elif defined(CONFIG_OS2)
-#include <string.h>
-#include <sys/time.h>
-#else
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/time.h>
-#endif
-#include <time.h>
 
 #ifndef HAVE_SYS_POLL_H
-#if defined(__MINGW32__)
+#ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #else
 #include <sys/select.h>
 #endif
 #endif
 
-/**
- * gets the current time in micro seconds.
- */
-int64_t av_gettime(void)
-{
-#if defined(__MINGW32__)
-    struct timeb tb;
-    _ftime(&tb);
-    return ((int64_t)tb.time * INT64_C(1000) + (int64_t)tb.millitm) * INT64_C(1000);
-#else
-    struct timeval tv;
-    gettimeofday(&tv,NULL);
-    return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;
-#endif
-}
-
-#if !defined(HAVE_LOCALTIME_R)
-struct tm *localtime_r(const time_t *t, struct tm *tp)
-{
-    struct tm *l;
-
-    l = localtime(t);
-    if (!l)
-        return 0;
-    *tp = *l;
-    return tp;
-}
-#endif /* !defined(HAVE_LOCALTIME_R) */
-
 #ifdef CONFIG_NETWORK
 #include "network.h"
 
@@ -80,21 +41,13 @@ struct tm *localtime_r(const time_t *t, struct tm *tp)
 
 int inet_aton (const char * str, struct in_addr * add)
 {
-    const char * pch = str;
     unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0;
 
-    add1 = atoi(pch);
-    pch = strpbrk(pch,".");
-    if (pch == 0 || ++pch == 0) goto done;
-    add2 = atoi(pch);
-    pch = strpbrk(pch,".");
-    if (pch == 0 || ++pch == 0) goto done;
-    add3 = atoi(pch);
-    pch = strpbrk(pch,".");
-    if (pch == 0 || ++pch == 0) goto done;
-    add4 = atoi(pch);
-
-done:
+    if (sscanf(str, "%d.%d.%d.%d", &add1, &add2, &add3, &add4) != 4)
+        return 0;
+
+    if (!add1 || (add1|add2|add3|add4) > 255) return 0;
+
     add->s_addr=(add4<<24)+(add3<<16)+(add2<<8)+add1;
 
     return 1;
@@ -117,7 +70,7 @@ int resolve_host(struct in_addr *sin_addr, const char *hostname)
 
 int ff_socket_nonblock(int socket, int enable)
 {
-#ifdef __MINGW32__
+#ifdef HAVE_WINSOCK2_H
    return ioctlsocket(socket, FIONBIO, &enable);
 #else
    if (enable)
@@ -139,10 +92,12 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
     int n;
     int rc;
 
+#ifdef HAVE_WINSOCK2_H
     if (numfds >= FD_SETSIZE) {
         errno = EINVAL;
         return -1;
     }
+#endif
 
     FD_ZERO(&read_set);
     FD_ZERO(&write_set);
@@ -152,6 +107,12 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
     for(i = 0; i < numfds; i++) {
         if (fds[i].fd < 0)
             continue;
+#ifndef HAVE_WINSOCK2_H
+        if (fds[i].fd >= FD_SETSIZE) {
+            errno = EINVAL;
+            return -1;
+        }
+#endif
 
         if (fds[i].events & POLLIN)  FD_SET(fds[i].fd, &read_set);
         if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set);