Mercurial > libavformat.hg

changeset 3756:d1f44b97b743 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics after previous patches.
author rbultje
date Sat, 23 Aug 2008 18:52:26 +0000
parents b9c1bcc6c1ca
children 7ab85dd1ef03
files tcp.c
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tcp.c	Sat Aug 23 18:49:16 2008 +0000
+++ b/tcp.c	Sat Aug 23 18:52:26 2008 +0000
@@ -32,27 +32,23 @@
 static int tcp_open(URLContext *h, const char *uri, int flags)
 {
     struct sockaddr_in dest_addr;
-    char hostname[1024], *q;
     int port, fd = -1;
     TCPContext *s = NULL;
     fd_set wfds;
     int fd_max, ret;
     struct timeval tv;
     socklen_t optlen;
-    char proto[1024],path[1024],tmp[1024];
+    char hostname[1024],proto[1024],path[1024],tmp[1024],*q;
 
     if(!ff_network_init())
         return AVERROR(EIO);
 
     url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
-      &port, path, sizeof(path), uri);
-    if (strcmp(proto,"tcp"))
+        &port, path, sizeof(path), uri);
+    if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
         return AVERROR(EINVAL);
     if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); }
 
-    if (port <= 0 || port >= 65536)
-        return AVERROR(EINVAL);
-
     dest_addr.sin_family = AF_INET;
     dest_addr.sin_port = htons(port);
     if (resolve_host(&dest_addr.sin_addr, hostname) < 0)