From 8b9af28da487aa01edb78b62a30fde0ac2540709 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 23 Aug 2008 18:49:16 +0000 Subject: [PATCH] On failure, return directly because the fail: case does nothing. This also allows easier control of the actual return value. Originally committed as revision 14925 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/tcp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 470d0ce..21a66a2 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -46,20 +46,21 @@ static int tcp_open(URLContext *h, const char *uri, int flags) 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: -- 2.7.4