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;