From patchwork Wed Aug 11 19:01:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp46247iod; Wed, 11 Aug 2021 12:02:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwC9cyNYqaG/rNcJMCZX5fPLEJJcq0DVZXOv/4CgsuVoCXJ+iEJ/n4rPcNQh3XJojIJ7ZUz X-Received: by 2002:a17:906:444:: with SMTP id e4mr4981484eja.255.1628708556421; Wed, 11 Aug 2021 12:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708556; cv=none; d=google.com; s=arc-20160816; b=WNTlAJZN9+k9CKJmZ+k+GyeHJVJ6wl4W+3biHjhIu7OMne7y+T58WeJYzDqpnnfp1d 787XXbz9pAry9w9Dw6XHe2hN7guB+qaR1dBJ6w090YONDmBZRSWyBoq8snUcNdRTuAwK /9WtW7Bocov0HwGq9Jqkpc0xp5ReFEJRGQ4Znmgsyignz0Rtywcw7y4XiO3D2/kl0D/m 2YNZqTZClqiXO0KkzWpJ/RSGBRXdaMaGctjdpNPVprhgWQHh+HRAftJZMJBCjILYn3mn aCPRVMeF20kOMD+Etgjwb9DV6B+Fb+6Rv6AhBL0edbwoA1CO68iquOTKB7xSvfO6JQyl Lxng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:to :from:date:dkim-signature:delivered-to; bh=4d0QPB6sR24rkhYb7rQk7EDT8AwkaUs58bPjA0WJTY4=; b=I16duLzSE4md06/iJxub0EgSDmh4Y33weDJ0iHpJ4yR7F2XUuiPQsmXYuw+mt4o0Cs SMx4cbeD2+CSyFbaN8sbHbfYzdKXiKc5Cy9F/TgqC/vaqtAdaUsvmCskfQVSzY2PZs6B X4ClFBFBQ0vC2zyivsFd48wjSfi1NCdG7/LSctiEn4S/KHaUisR3AbaOJYb0pSN8e2+B jLUaqIP52ekt7Uq4pRwYpEsFVbL/uS0Pifm2Lj+PA5d8pWnqT21in9ByD9GliBTSVD/q sk5v7C83Y/QktkugQcY/G9c0xeT1aMJpmqiU86D8ffZK/q6cphh9PfSL+jj4ORFR79A9 VBjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QOXjszpD; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n18si171965edt.538.2021.08.11.12.02.36; Wed, 11 Aug 2021 12:02:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QOXjszpD; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8E9D68A5F0; Wed, 11 Aug 2021 22:01:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17DE368A5D9 for ; Wed, 11 Aug 2021 22:01:25 +0300 (EEST) Received: by mail-lf1-f48.google.com with SMTP id w1so7728371lfq.10 for ; Wed, 11 Aug 2021 12:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:date:from:to:message-id:in-reply-to:references; bh=UOUmD7gz4q8IEF8Vivz6WiZT1lnp28tDK4VCUCUGe7A=; b=QOXjszpDH6hpUucD7EX4P8v8JBanf/osdpIM2BeJsWUiBNiaDc9ruP/FlUc6JLJWRP oTKOd9k5SpS8lkNGuy79c7Uh4za/eucr7Z1cS5PbQEl0tP4T+BwenKib0OW6zmQuM6vT uV8/pmdbgC2zUOzjlbnz9EyUL1cLVW7wlQ6YwhGxtucQ3J6W19t4eBM6M+/g1f26i8YG EBqSwUjEpra3smMHAIcXPuN6sFCy8sNqQbYXFSXgpPP8faGs2AzP5JHyK2H6y6oEdkqg opflU3D+hm8ymHUY1WykLNYVLH7yYsqv7XT5B/ivdbktbuBIk/NqRktqgq9h3YqBMvW3 tkYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:from:to:message-id:in-reply-to :references; bh=UOUmD7gz4q8IEF8Vivz6WiZT1lnp28tDK4VCUCUGe7A=; b=QUq27AliAmPlqA/VdKGzLlJzQsyW2oEdOltlc2h535SCs0jBnm5wc3z19gnN4VCgzG OURFCUZv1ocx/t5fptUbyLYQRVeprlhavsrIudFa4fWL0OhrC/vR+cfGkAhKjsK0cDqP WTXotXdPqwJGVEH0DKNor3OWPfvVUiWADg/d6tWdl4rarHjCL7VoKZD4+szB8lg4du0K gwHWVnSfChe2GArl9DS7ovRMy139hwMtgeNsTb/Um/smGvx4D0oOuQYBKkIK2AiyTCG7 2h4V6li+I0WTpm0GKBPutGS4hmyTdrtMtOQjNPi4inUZI0cZW0uT7h64koSTlyhcW5NB Lkcw== X-Gm-Message-State: AOAM5325VK33g9JIpwzIL12nv9wPvYotGXlAvGfVoekMK6S8JI+pHEdx 5sEOlHXmPzuMu2ZvQOJssqvMrXr++aeIrRqUdWHqkQ== X-Received: by 2002:ac2:5a4a:: with SMTP id r10mr215923lfn.24.1628708484908; Wed, 11 Aug 2021 12:01:24 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id l9sm25433ljq.79.2021.08.11.12.01.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:24 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:12 -0001 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <2ee0958751c14816acbb5a9eca699c0b@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.a/3] libavformat/protocols.c: avio_enum_protocols(): Move branch to bottom of function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6pKYzkm4eWey A 'goto done;' statement is used to jump to the desired code. --- libavformat/protocols.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 0deadbfbe7..032f07bf72 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -102,11 +102,14 @@ iterate: return (*p)->name; } } else { - *opaque = NULL; - return NULL; + goto done; } ++p; goto iterate; + +done: + *opaque = NULL; + return NULL; } const AVClass *avio_protocol_get_class(const char *name)