changeset 3755:b9c1bcc6c1ca libavformat

On failure, return directly because the fail: case does nothing. This also allows easier control of the actual return value.
author rbultje
date Sat, 23 Aug 2008 18:49:16 +0000
parents 8d267b43eaba
children d1f44b97b743
files tcp.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tcp.c	Sat Aug 23 18:46:30 2008 +0000
+++ b/tcp.c	Sat Aug 23 18:49:16 2008 +0000
@@ -46,20 +46,21 @@
 
     url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
       &port, path, sizeof(path), uri);
-    if (strcmp(proto,"tcp")) goto fail;
+    if (strcmp(proto,"tcp"))
+        return AVERROR(EINVAL);
     if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); }
 
     if (port <= 0 || port >= 65536)
-        goto fail;
+        return AVERROR(EINVAL);
 
     dest_addr.sin_family = AF_INET;
     dest_addr.sin_port = htons(port);
     if (resolve_host(&dest_addr.sin_addr, hostname) < 0)
-        goto fail;
+        return AVERROR(EIO);
 
     fd = socket(AF_INET, SOCK_STREAM, 0);
     if (fd < 0)
-        goto fail;
+        return AVERROR(EIO);
     ff_socket_nonblock(fd, 1);
 
  redo: