From patchwork Sat Jan 11 04:25:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17297 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 04227448C20 for ; Sat, 11 Jan 2020 06:31:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBB2368AE27; Sat, 11 Jan 2020 06:31:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D94A68AE9D for ; Sat, 11 Jan 2020 06:31:39 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id z14so3962296qkg.9 for ; Fri, 10 Jan 2020 20:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Sxl06SLM5xNWuxNueOgeyX2mwAAAoiq1Lu5DiImQnYw=; b=dywh5XWC+CJjzgOsXrVme2z2Asbv/WKVvqzADMCY/tmVtPjR6u7rs0K24XZM0LHTj8 acCaH757niXA6I+NaDK7Aa//ojwOhkbcxCrePHuULAM+c25D9DsSjoY+qzNcwpcfuTBK AKtkWktuJk2ma+Hk4Bc7QNwZIxQkM7GoWmG1wdGknXfgmsbHw9FwL//Uthmoh6fJ8IWv CEmZhpoC9jbK1abqYJYT3P9/FgX1ULTrOfnPOOLlX1jteRoh3873ueuqfkTZW6MDt+dE pBTyC9uVPmNd7TbrzS8IDbUV8E5QF1Znir/HVFhLJOsXlc0nFlYALhxAbAcLhpcBFff+ N4BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Sxl06SLM5xNWuxNueOgeyX2mwAAAoiq1Lu5DiImQnYw=; b=Pr8Ndf2dm+2+7J1ykO4Xj4nQ3vwtZqD853pgoVEl0d9GfJUkoQf78DAyJBT3H3IfPj gTfCIJnWEEeuS99k05MeZQO5GMuVjfB0NDdgtqI99l7hsVoI+BMHdXIIFvDVW52FeISf F5fdWyNh1yd70G8qCp27KcLjiWAM2nmcGwaRoZ3J6hPeZKrzfNGITqF7LPOYB+MVF+dM 1ZR0zr84/tITu/vkxeOl3UJJuJ0Ia68F23g+wRJMUoL38UdN3c8RgpCuY02mCwHoHTU3 t0aTKpVmzs1Gv7/0af3MoagyN5tsmnBnalt8s9cE8okDTXJFe6gi09fl9ZR1LyaHfrul g6/w== X-Gm-Message-State: APjAAAWCuvz6RQMETepH3rxczChPxYSUNT5aNmrlleRp03j349kJ5WU+ 54uelPQ1uYgvW5m1He0QfFHCJDbn X-Google-Smtp-Source: APXvYqzUTegrBPNYR8QusBb0gHtnruzin1bNoVCy8ARx9wn+n/LFzin2YMm5/rULbJWgm/Dd2lp5RQ== X-Received: by 2002:a37:a80a:: with SMTP id r10mr6215570qke.240.1578716786578; Fri, 10 Jan 2020 20:26:26 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id m10sm1833045qki.74.2020.01.10.20.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 20:26:26 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jan 2020 23:25:26 -0500 Message-Id: <20200111042526.32351-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200111042526.32351-1-andriy.gelman@gmail.com> References: <20200111042526.32351-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/libzmq: Replace fail statements with goto X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Signed-off-by: Andriy Gelman --- libavformat/libzmq.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libavformat/libzmq.c b/libavformat/libzmq.c index 2df55542c7e..8c8b294c921 100644 --- a/libavformat/libzmq.c +++ b/libavformat/libzmq.c @@ -101,16 +101,13 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags) s->socket = zmq_socket(s->context, ZMQ_PUB); if (!s->socket) { av_log(h, AV_LOG_ERROR, "Error occured during zmq_socket(): %s\n", ZMQ_STRERROR); - zmq_ctx_term(s->context); - return AVERROR_EXTERNAL; + goto fail_term; } ret = zmq_bind(s->socket, uri); if (ret == -1) { av_log(h, AV_LOG_ERROR, "Error occured during zmq_bind(): %s\n", ZMQ_STRERROR); - zmq_close(s->socket); - zmq_ctx_term(s->context); - return AVERROR_EXTERNAL; + goto fail_close; } } @@ -119,27 +116,28 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags) s->socket = zmq_socket(s->context, ZMQ_SUB); if (!s->socket) { av_log(h, AV_LOG_ERROR, "Error occured during zmq_socket(): %s\n", ZMQ_STRERROR); - zmq_ctx_term(s->context); - return AVERROR_EXTERNAL; + goto fail_term; } ret = zmq_setsockopt(s->socket, ZMQ_SUBSCRIBE, "", 0); if (ret == -1) { av_log(h, AV_LOG_ERROR, "Error occured during zmq_setsockopt(): %s\n", ZMQ_STRERROR); - zmq_close(s->socket); - zmq_ctx_term(s->context); - return AVERROR_EXTERNAL; + goto fail_close; } ret = zmq_connect(s->socket, uri); if (ret == -1) { av_log(h, AV_LOG_ERROR, "Error occured during zmq_connect(): %s\n", ZMQ_STRERROR); - zmq_close(s->socket); - zmq_ctx_term(s->context); - return AVERROR_EXTERNAL; + goto fail_close; } } return 0; + +fail_close: + zmq_close(s->socket); +fail_term: + zmq_ctx_term(s->context); + return AVERROR_EXTERNAL; } static int zmq_proto_write(URLContext *h, const unsigned char *buf, int size)