From patchwork Wed Aug 11 19:00:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp44868iod; Wed, 11 Aug 2021 12:01:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8H2/CQLoC44Rxv4wc8mQ8VGcNhPlQ8vbKo3u110ugqe/nXobEHGd7QWF+av6meBa4zEQu X-Received: by 2002:a05:6402:95a:: with SMTP id h26mr421916edz.109.1628708462801; Wed, 11 Aug 2021 12:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708462; cv=none; d=google.com; s=arc-20160816; b=CkN0+l0z3iR7rFhoUPT0WW8miOoS7K8aamVx7nlGTLcXMi0ERF0VaXWTK/ej7RNP4w J+4qK4Qi962IIe/431hc7K7shwZZhU1w1ZGCgaMgnLcL7Jy4vCsesBCfzDx+T2OFkD4y VWhUNvyCtSMrXZeX6KN+2ayplqfAYsYG1M2Vsd9uk7o6k05+Ko6zYBvxWlAhM2TcOLYp qy2KTTS7PCZbn/PuvA7dtbmEG1EGNwOoAjQ6WM4O5U972tiXv7Y1rjRZEjxSk1c+d8IR BguGaYlsPiM2GpFtxa6Aw6jJlvI+YJPMpSp2Q9kvidnojVjiKJJD+/RJxl4JXiUyQwPh oOzQ== 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=in/JyVtE/U40nWwCjqZH0iej6+3R/nL4yB/ul52Hp8w=; b=SThXOhxvU77lu6SDau+Sjx5/luRY9Pbvivu1XwzEvvx3TtRENoOLcCV5tjxy9kUDi4 0eYRoQXGi2nTjGsFKrXi27drQ2QoV9PKF0j6anVOnNRYhshpUvyAKgAqeOHZslr5fWE2 UDZSiNm6FyAUnU41Wu9fnYRFWu3Q779kV9KLyo+mujxlqu4XxBLpgyEsDamzmWDztLma xASCAr/2bLfsSP20QICDJY+Mz834doMARuJ96QTNWISMaXK7i2bRwgIh1Wy2PBk5m2kS gYU7+Y6zS2knCTV6xIH3Ljyeb3+eMcaB2mcEkoDPwt4KCqTltvZPqesbHvc3S/MERpxo W8CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QREAAlUA; 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 p15si199924edq.262.2021.08.11.12.01.02; Wed, 11 Aug 2021 12:01:02 -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=QREAAlUA; 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 3EE7B68030F; Wed, 11 Aug 2021 22:00:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB70368A370 for ; Wed, 11 Aug 2021 22:00:31 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id w1so7722440lfq.10 for ; Wed, 11 Aug 2021 12:00:31 -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=ms8HoqHOMN2wyMHvVF75SxwzXcz2N/jYF+AiPB5PbyI=; b=QREAAlUAmeov2L/Q85et5AwytTUKLaLYfnVyUgaQqDYoX1UrGeLL/LDzF8r10GK7dY JzaO8hj788CkF0tTKIyVcOkPRPXHA2f7B2LxJgaVpphZP7bFEaxxg1Bt87W6umctUC9v aY6l5WFo9E9a5UQ1t76hxGxXkFoeoGv6ChtVnwQKMefE/w4fRSPh7E2WaROD/NqcY4l6 M2ezEXVe5Ttks8uKGaFj1Oc0khk2yZ6Kw1zI6RofN3rbWCY9uNNbPs8HPnv8aH6D7Frp zubPQ59EEVF2GGNtoPVb4EH8nezjc+0iThKY3SFCHzk3e53bQoDkaccFLWqzEPmy280r FzgA== 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=ms8HoqHOMN2wyMHvVF75SxwzXcz2N/jYF+AiPB5PbyI=; b=DzrH/i907U9j2dNOCF16DUe9w2PujnoQAsFDbn6Um5zmxmfgqh+4Zw21TmZEtgEcvj rNIUG3YMGT4Hte41tenBnRvtPaX60sPXD5O2Y/xxOCKsqlqiTPaBfpdi4HariAHS1y6h qrzHTy1mlhEGqFthIfMpR904CpNYCYyuutfVPbYVhcwYIkKy9WuqtUPxzE6mZrRTS8hY 4AZ4aB/qWF4mFcZT/pdjvxqFFTVF87oULz0D6XpPrHB1xoHQs5s3J7ciX+L/pozbDylc lWZX/ZlVaZarbU+d7jJins+FcRspikZr+Ma+In6PlBnFxrnhq1zrPB9iq9X8qXvDXWOg M+Mw== X-Gm-Message-State: AOAM531lp0T5bawlf1ip4nPPNTXOFJl2hJlR/ybg0r8wQ8nt4h2RV/l1 604tf/nFquqsc6Ze00YpLofuLpNFceHzKAk5X7upng== X-Received: by 2002:ac2:4425:: with SMTP id w5mr189495lfl.640.1628708430928; Wed, 11 Aug 2021 12:00:30 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id u15sm16870lfs.203.2021.08.11.12.00.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:00:30 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:03 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <81fc8bc6d09748c690e378a877b2a90d@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.1/3] libavformat/protocols.c: avio_enum_protocols(): Split declaration and initialization 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: tCeXsHejL+Lj The main purpose of doing this is to allow for inserting a a statement label; as I recall, a label cannot be placed just before a declaration, even when that declaration has an initializer (then again, I never tried, so maybe this is not true...) --- libavformat/protocols.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index e671c5ab6a..1c5e3b2bdb 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -93,8 +93,9 @@ const AVClass *ff_urlcontext_child_class_iterate(void **iter) const char *avio_enum_protocols(void **const opaque, const int output) { - const URLProtocol *const *p = *opaque; + const URLProtocol *const *p; + p = *opaque; p = p ? p + 1 : url_protocols; *opaque = (void *)p; if (!*p) { From patchwork Wed Aug 11 19:00:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp45036iod; Wed, 11 Aug 2021 12:01:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywj2RVu3GizOrCIvsVF1ENkSa6S7pzRP/Pjwil49zmWghQ8cyJYDztGpRrCPCZGw93Nsdg X-Received: by 2002:a17:906:2495:: with SMTP id e21mr9895ejb.244.1628708473002; Wed, 11 Aug 2021 12:01:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708472; cv=none; d=google.com; s=arc-20160816; b=t18CYJgUVRuokBAI3Rru5yiX3MLbDhEYSE70wHDab//HVkSzwuMpsWLlHTzkT6yiyq 5bu29rb/4XkMYcvEn0lSscH77nVEhnhzalxDo0aNlAA971sXPaBtUQIjeHgF7orSMY1o hMxvpseqcQcXzQ54LGsTY12HZ5zcL3LIRtHE60OPQN8KGfPYQrxS1WoR3gvjwBFo2f2F bs2qZtB+LNtczWNF+mZYOtLfD7gTdXxY82F+O/sZFcS9Ph+D3E6JFt5dM5IrC5RYyNVa W1t3VWpDwNPUixlKXKxoKAvncDtUb4vdj+zAC2rnS8yCK2i+1DJsDm5gFROE+GWBKVuS BbwA== 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=blvQjF7FxB2s5XQMLsq1rj3ey4r2PVcDdakPCDlaR18=; b=RFumFWYN+t+BHcMlUQprzNV63ro+WirZVM7hai9OCdNrjJIcQeAL+i7TStO0CepWqo 8SUuF7J+3lusG8vh8HtX3k4LA7pPjn7t5XYivg5/pk8vr21lAFpxb7xlBH/+vA+2xeJX Lt/DxFzX3eLSm2EgUa5z1FOloaBzBE/MnC2NQIMCEhx2/p3RohgLRxZEfU013Q67Qtnc eczQsDFNkLo6fqJwjbsIe/atvBiZF7890EZu38eEYD8BE9BY7u7BWQ6QBnqR/YWisGi5 U4fCbeF7So3LKxTc+ugOIi4EWg+OmEOyTGCnanDq1rX1HQHY2svkhRdBcZjbJLBYQwap wNVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fSokK4lD; 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 r7si10939891ejz.374.2021.08.11.12.01.12; Wed, 11 Aug 2021 12:01:12 -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=fSokK4lD; 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 4463968A4D1; Wed, 11 Aug 2021 22:00:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4033668A4A8 for ; Wed, 11 Aug 2021 22:00:38 +0300 (EEST) Received: by mail-lj1-f178.google.com with SMTP id h2so6272228lji.6 for ; Wed, 11 Aug 2021 12:00:38 -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=4fJF7D2yUTILkbGNIC4WLXmwAzAcU3VK7e44L4BMTG4=; b=fSokK4lD6SVq9cKBSXLDWzQ3ukVlsS5ZT50lp1z1v0Z61/gxTfoDAeH6kDKNdMILNO 5V9VF9c7IJ8AQxfPHzCBlaeMnefR2r4WxlOO1H2UQqsZSKqsajguym1rrgk1iYR/Jw8U Gn+xj28/AhWUYLzvAXzaQBtyS1bB/rnr+AoAQsSNBFbjdfMuaI4CLp2p5gn1NdD7wh2s QfWEICewNA0vsUz8DsW1g11ZcUjqvErq5qaandf60LjUXaxliY+4TlemR3aN36h+cjpv UewOFM5OeJ1zzQL/vgeMMHKuG0Y4X+AtZu0Pu+B3MbUxzzrAWe2ZhMYbYlSLLs7a6xk7 llAg== 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=4fJF7D2yUTILkbGNIC4WLXmwAzAcU3VK7e44L4BMTG4=; b=UEvOA3wHU6vO65Ac5n5zLobo1SrZKEqguFvwESHOJQeWvbLb0Urubi4WeBXysQEU2l FyKjPzqww5JriYakiGKXLsVuldp/REiWzyl7ILlFzYvZfdifZD4vk7vChI/cz7OBRpdI NMQsUvDbEEusRVnasdJZyyM6BWBYlHfgUuWv6cUS4jAuYMH4r6jg9wpjln/jgR/DSLNv 7FiMeX/j9kgkqyaAEAxeLUApSSYrvcqORUoD3ZghdNgqnj55OCO4EfF9zbayaOLuf9NJ vi0QKk5EElP55hVMN5sYxnE7ieYRCO04DKC0hK8PhaM//HJlguBIDBb43x+DSsvIvxYx mW2w== X-Gm-Message-State: AOAM530LC8w2Hr0WBU68jDaFbl2UoTnzjzElWi5sqjNlGwcMIWl7dxG3 OxZEaan9t5ST14QLuTr5q3pDNllZBZuJ4X3W2S2IOQ== X-Received: by 2002:a2e:a7cd:: with SMTP id x13mr117330ljp.448.1628708437432; Wed, 11 Aug 2021 12:00:37 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id z8sm26696ljn.11.2021.08.11.12.00.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:00:37 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:04 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.2/3] libavformat/protocols.c: avio_enum_protocols(): Convert recursion to iteration 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: Ap5RWT2cgV1R In C, it's generally not good to write a recursive algorithm, because it is not possible to rely on the compiler to elide a tail call; therefore, this commit converts a tail call into an iterative loop by means of an explicit 'goto' statement. --- libavformat/protocols.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 1c5e3b2bdb..b0aae66dab 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -95,6 +95,7 @@ const char *avio_enum_protocols(void **const opaque, const int output) { const URLProtocol *const *p; +iterate: p = *opaque; p = p ? p + 1 : url_protocols; *opaque = (void *)p; @@ -104,7 +105,7 @@ const char *avio_enum_protocols(void **const opaque, const int output) } if ((output && (*p)->url_write) || (!output && (*p)->url_read)) return (*p)->name; - return avio_enum_protocols(opaque, output); + goto iterate; } const AVClass *avio_protocol_get_class(const char *name) From patchwork Wed Aug 11 19:00:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp46834iod; Wed, 11 Aug 2021 12:03:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDKMnr9RlpbDZR2ZO5BI/0nASMlm+Wvl5bfRl6J7ImGvrdcn6pN6dg8uW094y5bLxcwuj3 X-Received: by 2002:a05:6402:39a:: with SMTP id o26mr491086edv.64.1628708593829; Wed, 11 Aug 2021 12:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708593; cv=none; d=google.com; s=arc-20160816; b=WsnSNRliKKL6UK0V5uMBKKMbmpfUUPiPg6EUZxKKk+/sOTJRkY0rGDgQBOWJabxswF zEMqmwJm3tZEWAdwU7k1vruojFrf0j6hMEQsmsCD+tBI0+v87+lF0o7P4kDOTJNYOuPd Tzu4KZAuB/jf9lnyCfOPy8N3eGsv2Hq7x+B0uh+CBe1BJSj0VRTnN8p19Cxs5G1CwglT KJ+6Ik+deO2wb8/ySt/H87unSlux1UhXbdPphWoyT1rHnn3mTdqQL1te5BC60AAVZQNu qgoUQJUGBBrkkObUMHplIt+NcQJBnU3aNm9Rpkh0kGtjZSoSBqyE8H0lgG98RADgbXqW BNpA== 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=fa8L/T6O7HydBbMC1zt5AiT/38dypzD4MVrt7kTt9Ss=; b=MtuAU0+qqRcPHe/2HBS0UNyqpHGL25kFzuMDiRCN6yKnyNkCfVIkdBKQgE8yc4uvBu yUG2PzRxIJo6jRDjhdMPWFk6TOoNia3GLR0+xDj4GNMmP88EiO3sksvKHxOKnCiWUeZB yJxaFTtz+vfLXk6QX5NiSqtVm1A2e24HSOanqgVa6cuDJltf6mgdon7F4BIQKHXnRyG/ A7qSPnN1/KwEdZiGa6INm4uTX5RvYo3jb5axpMIb4ufxHDIG9GPfF1QrwxlqZOHcghje EavqAdkYQ06lzZfSwhxGhrsMFmwEP+2HcgwK/Cm7HmNzf/a/hJbPe7MVYuoy43smtmUP 57Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TAly9SJe; 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 kl24si11123644ejc.190.2021.08.11.12.03.13; Wed, 11 Aug 2021 12:03:13 -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=TAly9SJe; 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 1AA7768A633; Wed, 11 Aug 2021 22:01:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57FAB68A613 for ; Wed, 11 Aug 2021 22:01:56 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id m17so2502238ljp.7 for ; Wed, 11 Aug 2021 12:01:56 -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=m2u70hX190GE1gYs6ftHkLokuUj827OLMS+0MPaeOgk=; b=TAly9SJeDG8ez+tuvcVG7IOeg8nHP/9SgGT8K06jflLc2p1SxUQp9mk5NPtiADQNgi aSLA77S6cjg9CbfpgP0cp7QGxyYLY3NhwZr6ZU6udhmbI/ioQXiY8gGV5WRUjrkLUEVS ussNU7d+pngCJzbTd3CA4i+jHwL55VON0UIXmmEQOQlddZhFmjy12yy3YUoQ4RJ6fef7 q/yfxN9T2K9oNaFQQrOjg6C+HGTGfy7GJALzgL8Isyma0GM92ij/ewsCkGJ5EwuuSHy8 JEkxkfWoj4UkaoQDWbhlhN8il/4lJ8ynNqEu2ZqHnxobluNub9eg0UpSSyBRjXiaoRCf hhHw== 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=m2u70hX190GE1gYs6ftHkLokuUj827OLMS+0MPaeOgk=; b=ADPqx6Nrh64MO+NwM1EU/tjwoVRh88a9IFMtqPjt9wzN5Kyqpm0WImNHKDn55mpKk4 aX3HPYx70aJiML7v85hjb/4oPPg1XnGgsRtPX93vLV3Y9vBFozEQGw0acdFt5dZ31Tzh MOLS44oGLcXpogZ8xfmhoEGV8j07gjg0hVTZcS0aLTG7sclKJzSqO1+Ln9XJVhkMcUog ADKe/xeBg84JLhQk5LT4cSK+O3RuR5Xqk/WH9BfahNZfAEAMV19E2I04J0EvLNwRuibo ZbVlfn0NjBSMSZm0ZDe1XJA6Lw+bkGnev2oMqGLwC6xJb0mB2Ohnz/dBpklKRyaUUbQe qXYQ== X-Gm-Message-State: AOAM531+wLZ7sSZzD4dK5QPqOQo6l+JsltQTHgj4eeMANhCpLIsupw89 kLv231ZBiTqfE1rezMNYfpVl4yX8j20CLhcZKcKZiA== X-Received: by 2002:a2e:93c4:: with SMTP id p4mr132993ljh.38.1628708515201; Wed, 11 Aug 2021 12:01:55 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id z8sm21135lfb.30.2021.08.11.12.01.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:54 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:17 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 3/3] libavformat/protocols.c: avio_enum_protocols_{input, output}(): Add functions to the API 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: RUr0Ae3a0JIJ In the repo, there is only one function that enumerates protocols: fftools/cmdutils.c: show_protocols() This commit simply has that function make calls directly to the desired functions, namely: * avio_enum_protocols_for_input() * avio_enum_protocols_for_output() --- fftools/cmdutils.c | 4 ++-- libavformat/avio.h | 22 ++++++++++++++++++++++ libavformat/protocols.c | 2 -- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 64237a4796..87f9be64c3 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1681,10 +1681,10 @@ int show_protocols(void *optctx, const char *opt, const char *arg) printf("Supported file protocols:\n" "Input:\n"); - while ((name = avio_enum_protocols(&opaque, 0))) + while ((name = avio_enum_protocols_for_input(&opaque))) printf(" %s\n", name); printf("Output:\n"); - while ((name = avio_enum_protocols(&opaque, 1))) + while ((name = avio_enum_protocols_for_output(&opaque))) printf(" %s\n", name); return 0; } diff --git a/libavformat/avio.h b/libavformat/avio.h index 3b92cf742a..455b872260 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -788,6 +788,28 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); */ const char *avio_enum_protocols(void **const opaque, const int output); +/** + * Iterate through names of available output protocols. + * + * @param opaque A private pointer representing current protocol. + * It must be a pointer to NULL on first iteration and will + * be updated by successive calls to avio_enum_protocols_for_output. + * + * @return A static string containing the name of current protocol or NULL + */ +const char *avio_enum_protocols_for_output(void **const opaque); + +/** + * Iterate through names of available input protocols. + * + * @param opaque A private pointer representing current protocol. + * It must be a pointer to NULL on first iteration and will + * be updated by successive calls to avio_enum_protocols_for_input. + * + * @return A static string containing the name of current protocol or NULL + */ +const char *avio_enum_protocols_for_input(void **const opaque); + /** * Get AVClass by names of available protocols. * diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 4cb8ae0b63..ca04ed2eb5 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -102,13 +102,11 @@ const AVClass *ff_urlcontext_child_class_iterate(void **iter) *opaque = NULL; \ return NULL; -static inline const char *avio_enum_protocols_for_output(void **const opaque) { AVIO_ENUM_PROTOCOLS(url_write); } -static inline const char *avio_enum_protocols_for_input(void **const opaque) { AVIO_ENUM_PROTOCOLS(url_read); From patchwork Wed Aug 11 19:00:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29433 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp45387iod; Wed, 11 Aug 2021 12:01:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHcVIJMggKM8WCByNcaHkGcwjoiCZuQn7bd7ljlBALK7DI0h4QE77+YYd2MpPNF/AUK2tR X-Received: by 2002:a17:907:9604:: with SMTP id gb4mr16610ejc.142.1628708495011; Wed, 11 Aug 2021 12:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708495; cv=none; d=google.com; s=arc-20160816; b=Gt+J/rRUJZmUKlLHFlqVhw6CpY+/Fuf82l10Jxbns+lSwqv2n+93PN+9ZS9ZDWAJiT 62iVebfEu0JXLAOO1YBU/gEoZ43AmrLrMGN3YxqD6Qr79peJHSt7goDRH9L6v+eRhHCe NRq8dAjm0qqUzplcODNRpvPF487XpW3eLwE6kA6K8tGjpBJOvPoHtT1fQw6EcmxZBBzP Ahnh205BIyoXjnz32Sdw3fB0bYMNGbonNdq9T1mHMs2Z1jwuWSTRg5f7HAIij5HtQV8u iZR0IAORCORi1VGMpXdmfyUKr+Tkyv3EOu4FBkaSaJkrwsWcGoDavtWObcHlbeuXt9eD 77uA== 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=FBmrxwZcNhuFCZz42iiwb6K+f7wdR+/JIJ78YzekvOQ=; b=mAbzq/zu3lphvy+PrQ0hsln3hMcja96mgDyo1tvRmzZK2HJAC2yxdFz/aQsbCmw1/3 H+nRQOtWoY/2LgDJwv4W8PCwRtUi0FvagjkfzfNcNI3Uenj0tDVeeWaFK5labiLAMvVz ChtdmJ1IAh5HzPtR5EP4mJOhdHuasmr+JTdlo75mVsfHAHHGMpAwGOycpIyNxjJNrRZs KWSjooBHtpsLnOjFY5kr3dgDLjy7lvFBz//U9hbrA9QdfQolOVWbgTQ6ytBmnrOCXeby 35cE2cynafA2yYGKJ3HpLZtFUDv9AuNrBbDxJ0UZkWhB933yYFF8SnEh2og8W4Nw69WJ mdQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JbVqCQAP; 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 ka11si24430654ejc.367.2021.08.11.12.01.34; Wed, 11 Aug 2021 12:01:35 -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=JbVqCQAP; 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 5F1C568A543; Wed, 11 Aug 2021 22:00:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7969668A4D5 for ; Wed, 11 Aug 2021 22:00:50 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id e11so819274ljq.4 for ; Wed, 11 Aug 2021 12:00:50 -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=fxFlruUzI1NW58mphFQlcgUroZcfeYe35ICLl7aUW7w=; b=JbVqCQAPWfdZkz0mrToX5XA6E0wFDryNNcJYoH9lk9Vlw8x6xHPCymNE0tnSjglCGH /7ZcZnyAv6ReHDdCbXne2KNBdF0ytPWcJ/Ro2ipQgKAUXP/oVhqdvjQEWsbNUH/BSJZ3 klNrWMv0UIGRjvaforOQwKTJ7jIhrBb5XD6iEpy+Eu96SwNNvSAhf2Apu2a5Fu7Wrn36 L4dCk+La9aav7NXmkBmUXjBoM4c3nu/o8KVsuLQNSbt9isF9vGShXjv4pu+sGzFNOE+u unVdaW+nYfwM9o4fKVCDVm5Mv4DHYLnDMzBxG6/nIitXUqstQeWvxCBv7EtLDFyih3O9 BHIQ== 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=fxFlruUzI1NW58mphFQlcgUroZcfeYe35ICLl7aUW7w=; b=suLzZkm7ePqCCi5K886gRqvRGpqEzJXObktU9qy6y747yC+tNLRUVC5Ty0I+rXWd3g nXkk2Q+gjl//WE9XaG27l3FlTLEMv2NU1DgCcdK2ySJol725g9szYcisFDNJ6QdtzF8U lBb7vOwVnrqAi4qY0ZvFGjzCJy7vPQmJ4thMbCetIfd2f2mgET63F9Y6MP1sLtkcrdAf hJSSmWx0o10tUxLZ3qQVc9m1/Us6R3cUplHBmW8eM4FFa7rTVjKzxVQRdqKwWNKpS7ro AlTUn9Njays2UUZG5agaNpveQzEZ2szyT0WRA3Yrct9oaUa9LgnP8SWSzeND5jPK5W3L WL1g== X-Gm-Message-State: AOAM530aYb6IESECJNvII/NoctRZUra0Mo5qQJr6UEw8HZ60fj7C7OoF qmV1YlxDmQr41tqiSiClgBroetQSpVPcaZgehajfUg== X-Received: by 2002:a2e:a4d5:: with SMTP id p21mr123145ljm.214.1628708449367; Wed, 11 Aug 2021 12:00:49 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id s27sm16043lfs.279.2021.08.11.12.00.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:00:49 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:06 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <7668e56bf2834e0683cc7ffc78f5f2b4@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.4/3] libavformat/protocols.c: avio_enum_protocols(): Consolidate initialization of 'p' 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: WH8gMOE+7k5i Now that the label has been moved past the initial assignment of 'p', it is possible to consolidate both the declaration and initialization. A typedef is used to simplify the declaration of 'p', and to help the reader understand what the purpose of 'p' is. --- libavformat/protocols.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 7e90cb067d..5e4bf5cbae 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -93,10 +93,8 @@ const AVClass *ff_urlcontext_child_class_iterate(void **iter) const char *avio_enum_protocols(void **const opaque, const int output) { - const URLProtocol *const *p; - - p = *opaque; - p = p ? p + 1 : url_protocols; + typedef const URLProtocol *const *Iterator; + Iterator p = *opaque ? (Iterator)(*opaque) + 1 : url_protocols; iterate: *opaque = (void *)p; if (!*p) { From patchwork Wed Aug 11 19:00:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp45537iod; Wed, 11 Aug 2021 12:01:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp2KK27hnr/u3FCDmZ15LiGPCKAzA2YxODtI6tguE2uX7KyjhigabUGgno9i5/BDYa50YJ X-Received: by 2002:a05:6402:1c03:: with SMTP id ck3mr439232edb.33.1628708505261; Wed, 11 Aug 2021 12:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708505; cv=none; d=google.com; s=arc-20160816; b=lqB+23LWd2BE/6H5dZzqPWvGjs5V1hBYI7WZGZZVaOI+yk2xh12cLmTe2LcDlIpIEW MaaawTdePYET81jNwQ8l1Xmp3HF/fYWTD84qVzpFoeLA9+eGOu366YH4fh0566VvoKtV eTVNGKMhqBH1next/Dx9I56Zb0QDWMcZC6tM8j89IYG5E0ViVEbJb7OM5SI0W07WX0hm F5qKfw4Mh3Qq3ABM4QRQxSOm6K0XzXFCj/H2OmYhdbAslMU/45LCusnLuF8TPBPW6Kkh ahLiIVg9HkAJGEH8WIEIfXCcdUJbGpzaW8nQ0EihdutQdj1gnXPii9lIQa5+TBekF4Dc yFTg== 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=YKMabUWz5VKwb0gSeSCa8o1JRyAGGYFMa125FEbhBho=; b=I3rExxYDTU1dLcOg/iA7l3c0KVZnYY2E+B4eC17+zPIxxSQEH+Y97h/dbFlbYzSL93 BjkOAweLmdkOM409FJjHF3aKNY54YJvJjqE4M7AM3gl2pffHBxNbMCLFLRhFz1N0QhKD NjsbxDj7JwWAJ6FJUpMqxSL+onmy0C/4a+8GS9cD8/++d6bhih0RbDk8xfjd5Dj2zXH7 FxAZK6DQ3O29+ngZbw7JuAAzRTtuLjjTCQNKT0TzIr76p1GEJNrXCtQRLCuo+E7YFbuW 4If/0hTq2UfsHqh1q65zhZr7mg0AvBHkgMuRarf5Qi0S4RmZ+8o8vFe8y2B+HpCDTK/x vsaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tJFodoSQ; 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 ee28si161047edb.265.2021.08.11.12.01.44; Wed, 11 Aug 2021 12:01:45 -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=tJFodoSQ; 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 6095E68A56A; Wed, 11 Aug 2021 22:00:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EDF568A4FE for ; Wed, 11 Aug 2021 22:00:56 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id z2so7978725lft.1 for ; Wed, 11 Aug 2021 12:00:56 -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=rD7jq4kK36hvm9WASMXujKWx1Z7A56pyTK27N8Kc4ME=; b=tJFodoSQkCKqHgMWBT/UZ7Iratkc5lSy2CE/3K0iEj4DPuljB8qU4Us7YFo/FNB2kF lRkLlzB3Q+WYaM/2vuS6aGTxK+FDqALcC9jcroBD5BdJHe4k1XTs8iirEQX4NZ9d6sbN tyP5cYK2q1ZUZMzM+iyp6niMo9JlG0wD3kAGslq/DVoCmuyVSw8NtsLO5i12gDljrm37 aSoOgIkG5PQM28S8DpmFg+ewqEEs/EBS/3vNCfSBPeCaWya3f24ZlFSeq5pi7XTHGcO3 a79JVZCyJSZhOJQV3JJIR3/pr1L3Xp/c+xQbQOHV5I3xkh/4Qsv4WcqChhdUk0b0Nrjo qf6w== 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=rD7jq4kK36hvm9WASMXujKWx1Z7A56pyTK27N8Kc4ME=; b=MijXSA7BEBLgCX6yczYLBdzN7XxUHILr+KrAsjq6CijxmBegcsCtq0jKlqbXp+hqS+ D1P02IsNCnXzEQIhY4Du69Wa8aXCmG9oMxikDeCQFDNrqp/Tv/P8PTGM+vZVudyHgFd9 F97FCA17L1bbg0I9+41GtPkte5vS53uKPVOn6mLKF030/PiVgIrYtOw2xRyoDN/MF9nU T6iBZiLO2Jx19m6jPbKQ3O90PMsEhWVrLU9t1Ipt4sdC257AxYEmsuNxvgwc5DC6lo0u siN6mIoJKPvbffZ2Byf5vI9CwT1De7GliNkKX1Ye1IMEa7dw8PV/Xw2XWRuwF8x9xfB1 YODg== X-Gm-Message-State: AOAM530RZyzOvn7x7X1PDwEqs05F4rWeVXSwqOR/mCarYHfuXWr3tmZh aunO5xjDVyPlj/83Hs/kT91HQj53124OMyFb7GjP+w== X-Received: by 2002:a05:6512:110b:: with SMTP id l11mr185110lfg.199.1628708455395; Wed, 11 Aug 2021 12:00:55 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id b12sm17818lfb.132.2021.08.11.12.00.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:00:55 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:07 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.5/3] libavformat/protocols.c: avio_enum_protocols(): Add block curly braces to 'if' statement 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: 4ds7/vZkRdXv This is preparation for the next commit. --- libavformat/protocols.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 5e4bf5cbae..bedaa9ef77 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -101,8 +101,9 @@ iterate: *opaque = NULL; return NULL; } - if ((output && (*p)->url_write) || (!output && (*p)->url_read)) + if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { return (*p)->name; + } ++p; goto iterate; } From patchwork Wed Aug 11 19:00:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29439 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp45688iod; Wed, 11 Aug 2021 12:01:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+PNp1SvM2aXJ2IAHbXi0zxOvW58yVzHYj4NCgXDN9CymfbvWGB+14yrckInIcufGXNpFz X-Received: by 2002:a17:906:a40b:: with SMTP id l11mr5259114ejz.185.1628708516281; Wed, 11 Aug 2021 12:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708516; cv=none; d=google.com; s=arc-20160816; b=yX1wLuvFhCPcmerIV2Y0fKoJdaW/bRGrCWFesimKNJ4WXBL79ZQmXiA1kFyk1QcmcH 0lg1loT2tV/cobZ4upBnNZ4ofLtF1AgLxb/bAtj0LJxcdhHtRIeaam1r/9u3II/DrvAs yqYlov8Qwm4SKWEmPLWlYJsd2VshKskpYog9SN1/eO4hnOkkumVLtE4Zag//BPV5ELDN 1RHrXCCJ8TVWcSvCH6SeugOh3Y2pPt9gVjvA/ruQjzP3lsqRHbBHICgs3dIq/I0HaGrY Nwvnm1OjATt15WL7TkX+X6NJMOqlIiUqJwCeB+qPoT0sMq2xCWKJ/+/5SpSxlovyLJ5x YRCg== 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=Zo702AbWLfOEvuNOYOKu1LRqgFScZApjm/PoYyutrk4=; b=zhq/HcesnaHIDH7KCTrND2msqErurq/Mzz7wjpGXwtH+Jx4fhAiRvsRxuV0Vw4/TSP qGihFcOIUgsNyw7C2iRsLPM+DEBPlnRDjZZWKcjagqfEVYeSPM94Lx+B3jufTNRJcHHr cd4Zvvu32XsHVM7/laIcdph/eSxFOjwHtXDBKog1/9C2gkhPxrmV6ggta7w4b1Rra/dS c7gQTRt1UWwgqEhA9K0llZNijvG00+W2DL8TDrKvEUJJaz/cuBquJ+9rQcoYbRy1K0Yw WwMimmsYKSC4jTug42P7KVVoqlCgXbIITIz/AxlKa3JeWZIAbOeGhdukpeQ/xfEP5Agk WGVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ITle5qfz; 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 v14si4273404ejc.200.2021.08.11.12.01.55; Wed, 11 Aug 2021 12:01:56 -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=ITle5qfz; 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 618E868A576; Wed, 11 Aug 2021 22:01:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F9BD68A583 for ; Wed, 11 Aug 2021 22:01:01 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id e11so820285ljq.4 for ; Wed, 11 Aug 2021 12:01:01 -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=DIOEEtTefufDd98vDhOLOnwVrjZd8RioPWwTAwmVqXE=; b=ITle5qfzix8ch15z/SsNGX9SgVnslHK6kzBQW7UYRx1qtAjTw0E3y5d00vVuntI5n8 cstvpug6/rlMUDRC/VxVgwfnrvarmxkdssD5PJ2qd0h1Hax4dkZd72NvtrdhysvOidnt W7Ze8N+DoHl5sR5Hh6BfwVqJgbOtftcV7j9e3p4pKc5Hmh53YGX7P0TXBqoD/YP3rZS3 bvD3LixLDmFAbFzZhPvIlcbTYNTra6LnCvtJh9DVxa47DPFAAN+a3a9np+OSNPi2jHnG Jz3catzZDadWqitVZBm26vH1Ca3hWeo3+qorARxWwTa/aUxZOFvcVExo/fFA0QwYN24P 1JjQ== 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=DIOEEtTefufDd98vDhOLOnwVrjZd8RioPWwTAwmVqXE=; b=XZSbAw44IcEo7nuobxqdKGMjEcprNr5GzD3pfi7QCLN0OqsrxTAR5JR4RkLOdIU/25 +fity9YkMoZ7LnitIT/PHlBJKCOOS5278SIHcDlrWLwCM66KDNeXf5hTG6L8RVCkcxKi DDw1AlepqPoyeQaMJl5YEi4qL0sBFybBC37n+F6ejp3g++Sj7L5ddndVrQBov2qhF1cq fO6KO6tlZofPdsyFDpHj3j5nKjyQ33dzBDQa+Id/bZKpV8cFenhUDV8rzn5F0daUuxz7 0L3dkJE0jI7DhYncpYw8t7cIJ7fHbTZ+E7ph9JaYqoc4nC34gedFS8Yflu+JqWDKkWPw X9Hg== X-Gm-Message-State: AOAM533wVtsPzsuPop9bcjFtvJ9WZoY3Iy94zfpxnZ2C9iLKfmzJEbgU Fi0U2OnBq+jhgif6BdPPWM/o8rNYEkC39ugmF5G6OQ== X-Received: by 2002:a05:651c:211d:: with SMTP id a29mr129400ljq.262.1628708461128; Wed, 11 Aug 2021 12:01:01 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id z11sm18704lfb.52.2021.08.11.12.01.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:00 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:08 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <8f65adeb49474022aeffb015a110d135@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.6/3] libavformat/protocols.c: avio_enum_protocols(): Move assignment to '*opaque' 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: ByHTTP7SPoBu The assignment is not necessary until returning. --- libavformat/protocols.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index bedaa9ef77..ec7c72b14f 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -96,12 +96,12 @@ const char *avio_enum_protocols(void **const opaque, const int output) typedef const URLProtocol *const *Iterator; Iterator p = *opaque ? (Iterator)(*opaque) + 1 : url_protocols; iterate: - *opaque = (void *)p; if (!*p) { *opaque = NULL; return NULL; } if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { + *opaque = (void *)p; return (*p)->name; } ++p; From patchwork Wed Aug 11 19:00:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp45844iod; Wed, 11 Aug 2021 12:02:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3DlJ5+WNBYp38zYAfwpEk31SDz0kNDx6OXi5Ibem8DeXNNUx1hsTQpulwBbn2+duaLKe0 X-Received: by 2002:a17:907:b09:: with SMTP id h9mr12871ejl.278.1628708526112; Wed, 11 Aug 2021 12:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708526; cv=none; d=google.com; s=arc-20160816; b=yUaIPPDHlcvi8hnVjO1DG4TnQWYHXnHrBNgYiGBwFBAoQKJXJM+a5RWNdyePZEWXqV WpmVBa6+5uISHr6zZOM222ikj7GtBbb3We/oshxnKdEBRx2RrOhBNlXt3186WbHU7Bqa 67ipQRu9q/FRmgx+niwSWKQbGDmd3qnorSjz7bejjvbzAqcQ1f7IGUcK+SUJbVgTlr8m ttGTcHIPPI0FjfcgU9K7Va3bEJCc5WfbW7le+RG53eW+4kah6g8l0KA7nevW1j4645eW M9mCTQuW3Dnsu3kZGDKlXS95y7LfLeL+uXeul4zhEwoQztqm7grdgXC6g82DwZZcsQoY 11qg== 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=2a+N9ZT8KrHbl5jyqg4ghGAA79VNggnvjSqe05Y4vHc=; b=RZNugWCEKxo/39LpBj0BP8pxdl9cBXE5aZZH5C8iz5DWzhe097sTqgnCQ0NBUOici3 7zuTCDPgtxv96dNSXSqu8a4QeRbhQG6oYV+yT4k9aZi85S26QIepICHIhCyzn4BI8WrU hmHNRfUtbmQeX8VaKY3LUUrfZhcLUJExe7Fk2tkWoMe8XCtR8h0ab/gCbSOk8ZVfZsc4 vwj8mjLhruRqt2peitscGOn7+4sB0ODuL+Vytm6q4ibmgDVUWMSLu2QLFBJnAidHl7UD iUKDV2H04jVJy83fUkRc2NZ/QYnFQNU+zPcIIWSBvAXrFCt/SDNmVt8/f44YsTYw7J/f jnew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n0Z5MQoY; 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 r10si4887702ejs.281.2021.08.11.12.02.05; Wed, 11 Aug 2021 12:02:06 -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=n0Z5MQoY; 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 7278968A5AF; Wed, 11 Aug 2021 22:01:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFDCA68A5B3 for ; Wed, 11 Aug 2021 22:01:07 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id p38so8063463lfa.0 for ; Wed, 11 Aug 2021 12:01:07 -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=dYpGjvQkiVk1AjIUXgzIVSVWKwBdiey83EM4oFeuiZc=; b=n0Z5MQoYqmDy5l3JHAUg2/+GcK0cNvOrEC/Csq4cpipCdfDR0HENMZfvsHDXWTm+9O MhxxWp0iQYScQhW0llwXj+EZTnmQPLC/Qlz11YrMVH5i3RL3iq+AsKI7b6lS0zxFRhhI NIm3I5QXmcbBbOCIGTc91xmwaPZd25J/BkRKP2Ll247CWgonlYlJy3dlEiYqC8g4rbV0 CBHMVpEHF/884Jtv50Sxh/Kthj4QQOceFL5Zz3vfnWFZuwG+y0o3b8Vdr+c8TOjEqeI2 12SevJT8JeotVs+GecW26CRKqg2tC0O4WOGh12pd+KnWXhPv9QOQ8u+iVsrCi1P/B5/K Xuzw== 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=dYpGjvQkiVk1AjIUXgzIVSVWKwBdiey83EM4oFeuiZc=; b=TSK0MKyyHXtBFAb2elLeBKa4oeyMCuR5XU4TEbJiGCgbXKI5ZflxxcYd20UU5coQbg PVx1iRrW8lxRLhH+KKVtANatYVOvDnIOQn4i7mg49IjL0Bu53hn+OjSfp5n9uduL4eD5 Um9prfP2BgAnrS9s988E3+xxRJGNfN7KU5InMXZbFrV/9y5p6Ogfb+bMU2dSuh0kxHBl ARPvZ7fIeiFkqsrMI+aZlIvies5hXyzesxHeVxV24ktAaDT8y2G1vWU3a0FJ1JUu8bG2 CSjZmXjJrecpCXL8E9yD9wWdZ0RNDBytYHhWFdW92TV/myZipDOPLZuUKi+SqJWi/FCG e76A== X-Gm-Message-State: AOAM530Eb4WxlMLmRO1Z1Arl15VrMBUchn1uOEJ+IX/5nYeAp/Fvzcqy RgsAuj1KLmtSr6mNQsxDG1G1f9SUpNnFApBZ7E8uCA== X-Received: by 2002:ac2:5dd5:: with SMTP id x21mr170439lfq.605.1628708467145; Wed, 11 Aug 2021 12:01:07 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id s18sm17056lfe.198.2021.08.11.12.01.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:06 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:09 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <45e106fdfe83467ea64211d9dc176681@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.7/3] libavformat/protocols.c: avio_enum_protocols(): Indent code 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: 0GS06qem3EFE Nothing but white space changed: $ git diff --ignore-all-space "$THIS"^ "$THIS" && echo NOTHING NOTHING This is just setting up for the next commit. --- libavformat/protocols.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index ec7c72b14f..3f8433e317 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -100,10 +100,10 @@ iterate: *opaque = NULL; return NULL; } - if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { - *opaque = (void *)p; - return (*p)->name; - } + if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { + *opaque = (void *)p; + return (*p)->name; + } ++p; goto iterate; } From patchwork Wed Aug 11 19:00:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29438 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp46038iod; Wed, 11 Aug 2021 12:02:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrWtCxWb2Ld4Wq8eRU2QTxh7fx4z9gY1Uyn6jhkkLUdYH/w3/B0KmfJgzfYF/8s1eHI72l X-Received: by 2002:a50:fa89:: with SMTP id w9mr473285edr.142.1628708539876; Wed, 11 Aug 2021 12:02:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708539; cv=none; d=google.com; s=arc-20160816; b=ht9eqpwHJ2oiKZygQ7nT6BEXQKy1gsgKcnRQYk6721r5LP3cWcHoDkcq4FiU2Mz5Ys jxeZ97XntaTWNU/l+KK2vbd7KYSQ4boLyB5yV5c87W8e3hu8v3lV0VjjbGSFHiztE+yg W26EYwncJglLCV3VgS+tSp/NJfebAk/d0ZMy4d9NFSt262qXldQxbFKY2XFLOVWT+inT +OUUTiPQHB2uAYiE3oDnhJYgYmgNCgnnGdcri/XnUtd92hFR+oQYwSpI2uhVU/bY0oWS VwDr7nLFtgSlpbif4bSNY45aZmUd/RDsfs+qYiOZ2f5LqUO1ZAvl06T+fGoFgoKYmWXY 2psQ== 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=SVKp5MaU51c6QRjeFOW61ix83poKmDMwKjq9ftpyqoo=; b=A27gAlYPO7c7/gdSGj2mO3XNwhvMzpig2oOfiN5uK8vuEVD2P1VhQW8sOP/EHzSwUd lmQ7J/xU+gUDeoVZv4E8j4tzfxYJaMg7owKXqkScVboOHKGh1P7VPbq71ZfxtT1SOZ6g JFph/oY8VVkxjrDHHuVv5bfpjOvflVjU1ZdqnHHEa5wJdbjgHpUAUZkfKKNUXZZ676HD RMuVUvY9jRGBeEKY8lAzrT3db2EJGGH6NCa7PlxJqBozDHKwY2UgVI0aXlp6dYA3dhPF NKS73TY2AOYT87W+pSDPaoEPAqNkc8h69OMW0Xy6SxG1Iktw8gDDW4UXqe6AHLzxIdpY F1hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eqWg93kE; 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 bo18si24120919ejb.651.2021.08.11.12.02.16; Wed, 11 Aug 2021 12:02:19 -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=eqWg93kE; 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 8259368A5B3; Wed, 11 Aug 2021 22:01:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2CD268A5C0 for ; Wed, 11 Aug 2021 22:01:14 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id y7so6291195ljp.3 for ; Wed, 11 Aug 2021 12:01:14 -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=3aZnWfdTV/dGopm88tF72EHrh85Hhqj6rPPljaXnsxI=; b=eqWg93kEm/0Ohg+b+BPcCxMEjmqjZx8x2rryZbT7Wh9A+Kt2C8S8tlWI2GpuQH5+Ay kjQxNFkytPONRxuY7Zxy/UYDGdbKAQewbuvK3V6RWJSIXs9ICfK/JTeeDqQevpgviGzP QBBtktfWqltMcvExnu26S96PoHwbx4omgH8fndccH2IGqnTcFB/N+M+B6S2Z5+Lz91/u Mo7eD+YUksfQrBDIkT2bPsop8fDLdNnZN9XPJP3OJE+nW8gd/uGF+PTMNeR5XMbfDAPt +4e5Jk2Amluno0SMefKLUYHEQt+SCLLq43LTP387x4Y3ef98M10Jy9piJ7W8i7COzv6q qw4w== 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=3aZnWfdTV/dGopm88tF72EHrh85Hhqj6rPPljaXnsxI=; b=BaOwDF5V0OPNkjwooFHBImnMK6loDovB0b9nv47KjGTiIz0XYJepWpJA3FJigI1vuQ djE9JufixY6ucpBAbhE/hjz3HT/e/Jci0VzkfHbUBU7n/o9Ds7soES+qNUkVihn8dGND llxUiwzPYlnSRn5nn30ZKVybGHC37Z/AHNGeYIj3+b+tMgDDuPkiyOCY+E7UKkPlP6vZ x6GSyK+SM2f8tGORt3kd6QXdqKmPsbPm60rAms5wECOzN/onxBsmX6oGAEHWiUf3CfGR EsZxuB+WVOYr6GoRdoUC7Cie/OsnM0qHsFT8uoiZSGxcQNXit2daBDzsZJgW6GUb+hqd lsJg== X-Gm-Message-State: AOAM532uPyl1V08+mb4XqIXwTCbEnlicBP2bg7q0K/iZkgHuUr5hLT7b 5npZtXCdaeRV+p/5tIp+/ggyt8lW9BSQxc4HD9j4kQ== X-Received: by 2002:a05:651c:545:: with SMTP id q5mr114554ljp.15.1628708473573; Wed, 11 Aug 2021 12:01:13 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id t1sm18245lfr.95.2021.08.11.12.01.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:13 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:10 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <9f28159bc34b42b8924652babe113a7d@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.8/3] libavformat/3otocols.c: avio_enum_protocols(): Make the 'else' logic explicit 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: C+j4ys3wtbND --- libavformat/protocols.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 3f8433e317..5828113428 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -99,11 +99,12 @@ iterate: if (!*p) { *opaque = NULL; return NULL; - } + } else { if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { *opaque = (void *)p; return (*p)->name; } + } ++p; goto iterate; } From patchwork Wed Aug 11 19:00:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp46162iod; Wed, 11 Aug 2021 12:02:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKVMa/fBQmQCzkNcRMN8Y8ZXHNTqWDolgj9kNTiDqev5IwnjrRm/u/AToMDHvVAuJZofg6 X-Received: by 2002:a17:906:24d8:: with SMTP id f24mr28168ejb.2.1628708548488; Wed, 11 Aug 2021 12:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708548; cv=none; d=google.com; s=arc-20160816; b=HiiAr7RiwoGsbUODptgoaNOfS0O1hq1ngcOxdTGke1UpplfLoAaPp2Soqfk8nyGbMx 1yGUZoZRDrHUr1rtNcnyeOxGfhvO/+87RJqadBmY+ku2wtbmfZ25ZEkmasoJmkfpgM7v iKjd8rYvAvJVmDzAVlF/sfjewZr9e7mICEr5GSjbkYO16FgoIRVvSqcdxVvhST59XHyG vlkjQyCfPZk5g+HJK9+205Z6d11BgQhgDNbJlM8/SOrHinQVkQZUwujWpYsjEOfAwf3k k2BABtXw/oqw9iL7vZ4hBnbkxUXZyXUZK1IFubTSHegnFJiYO0Dl3wyi4oKfCEPFBwzL WACQ== 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=rOVohrxoU5lMBHPSYmwXidsddCo4O3E+gQIGEXKPfO4=; b=gu3Gc8SZJ353t4hV6Nz4TUdFw30cQug3xjz6f1KP7zCAtD5zQupUum/LpH41Ilnpi0 OiW6b0TNHhMC2uv1z4gOLSBurEu53wud5LlVaIRxe1+2QmOgelNjpGZskKLytLyjnfkg rkIoYxwDnATV5LrCat6LSl//YYPznB93YTTw89d2epqWWKWnQWIB9FR6HZ+t4D4Lp7gV OZtZhT8CEkPveBIGyytUNvOQZwhQq6nsaw0siMEny8Wex8G1fPV2v91swENyF+smd7zY IhnnAbaihW4ONVXzCQSclvhR5l34XQJXOXZ8/3vgI3Agp43PmzCQ8MGS2qLe3Q8/Ehxu 0+Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sj3Q+dQB; 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 v24si199331edy.16.2021.08.11.12.02.27; Wed, 11 Aug 2021 12:02:28 -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=sj3Q+dQB; 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 AB51468A5E1; Wed, 11 Aug 2021 22:01:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2596A68A3B0 for ; Wed, 11 Aug 2021 22:01:20 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id u13so6273494lje.5 for ; Wed, 11 Aug 2021 12:01:20 -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=TBsnsTu68lwoWnOTCHtuAm+QLvQvCFrB+ENjKQVBp+w=; b=sj3Q+dQBDt0MmOL/yrKIB9+bZYnL7QG/82kspuwqAJCluNB852dI+FgE+A1NRO59oF +GI3FLHtktiJrErVsa1MRqLxGiaf3W5LJrn82fpzJnfjapHX/BWoNm7iCdaKreTv8t0L g5QW1JLrG2RJr9JbfRLTlkvc3/8RRtvbTgq/aXN/CcOzgps73hJQa7D2S/8xhJMe6Vh0 8cPbcM7WufXM4wFRDH+LI6GkZWptlULuu2TGBg07N37AV/tDYu5q9fwLsrjIPXYAKZcT XGxHXL9dUmpdtNx/ac6YavZnJ32A94zFiOOPBeXmFngs/9HvC59qMKlOqDG9epj4fPul Nyzw== 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=TBsnsTu68lwoWnOTCHtuAm+QLvQvCFrB+ENjKQVBp+w=; b=Lxwlukps/P7YsJ3A1rNAiCrus7rVlFY2Dcu7a857H8R/8Lwz677kUygq5MWveZxSlP djr9SWkEEuMgIo1mQLUXZSOER4yHWoIpDR6RsJulB1IH0Ek62LkWhaxbA4a7BSoaPvFB RZlgSZVoiX0F+NHBtcMTH08vcKARxyOWwWWQxnv9qerst0cJL+w9yo6VUqjVmthyERFd ocHvwKyAb32JpUnPALeOJj1kgBGqza0n+LvPLzJ4mHtIPVY6K8E0uqeg7ZNPDRxghR7V kdPXPoZR8SKix+ig3j27Lgpzcq3qgqkzehRU6S5DoNJq9xuq6OZwo/OA32+5ZZkohVLn 0hFw== X-Gm-Message-State: AOAM533/qi8tEFGfXi3h34Wbmte93Nb09ZdsTVfC2LQgMOC19PKDZYT9 15sYYp0YfQ25x4D20gvUYnbdc1C/nA7iZAI+69snkg== X-Received: by 2002:a2e:a78c:: with SMTP id c12mr99223ljf.319.1628708479278; Wed, 11 Aug 2021 12:01:19 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id d22sm28372ljg.0.2021.08.11.12.01.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:18 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:11 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <4123b175895d4cee80b6f0df3fe91b3e@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.9/3] libavformat/protocols.c: avio_enum_protocols(): Reverse the conditional 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: esqBOh+YxYHB The 'if(!*p)' has been turned into 'if (*p)'; of course, this has necessitated the swapping of the branches. --- libavformat/protocols.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 5828113428..0deadbfbe7 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -96,14 +96,14 @@ const char *avio_enum_protocols(void **const opaque, const int output) typedef const URLProtocol *const *Iterator; Iterator p = *opaque ? (Iterator)(*opaque) + 1 : url_protocols; iterate: - if (!*p) { - *opaque = NULL; - return NULL; - } else { + if (*p) { if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { *opaque = (void *)p; return (*p)->name; } + } else { + *opaque = NULL; + return NULL; } ++p; goto iterate;