From patchwork Wed Aug 11 19:00:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp45219iod; Wed, 11 Aug 2021 12:01:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/fMknxWkViddsakP6slam1iknrotOH7cdVZx0IRfrYaehAJCkSS8UVps2fIkaSfUJYPn3 X-Received: by 2002:aa7:c306:: with SMTP id l6mr404102edq.383.1628708483934; Wed, 11 Aug 2021 12:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708483; cv=none; d=google.com; s=arc-20160816; b=mxWa9Fil6x3+XrImayIawe/ZnCddryiNUGa7apGQyPjO2JqasowVOmm9f3I2dOzM+1 +INGcV/1b6sb6XFOOrMsumfd53lLcNJzr29/Slbv2lisfvxlJD/xPUDXnVvop9dHc5Y5 ryyTC1kde85O3P5efv2Gg6j+iJU1M8nynXf6Iwgv/rYH3X5at01QTw5WLu0k4jFuWmIT 4+dOAqC2sxsy6rqMvkNWj2EPssKH0Y2x49lzPxcxnjKuL+obKj+lOiRl8FRmHtZ2yGOg ld4ba4HKEJzvSSeORv7E1o8s5sjMNqlLl/PyHM/oABGMZRDl1BPx3Nu4ki9gYn/muOc+ 9V+Q== 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=x2VtyyA7FUw/q66mdOKuW+OXgticeSnIOjK405tnOCc=; b=0Gck7Fp35FQ0CFEUtZKyEZGC/FimBE1t18e7LxEKC7X9v5OW/XH9vTNdEu5KTCuyaH 1rfpJygzCJ88iRruVY3cnpwgso5yHvwYc0Gb/7CHLehnXZJFrhIwpq2s8iW3pGlNCPJC HGC4f3RYbqv1XEN4JyNtGr9v5MuneAkjF3TSezRNiPqEZus90+FikP3QWUgfuS/9f3RB CP6I+kfJXohh1ocoTjuvsGnIkhBaE0TAyg7LaeDeJnJACACOc3rNhuEp9sO0r7OH81jb H2mA3cYaDrbxgGROtN2QhNxnX/hc2YKub/xV5QRpke+ysREy7XAtlqB1RKIco0JIXUiP q5Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OVw15SiY; 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 s7si188969edw.218.2021.08.11.12.01.23; Wed, 11 Aug 2021 12:01:23 -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=OVw15SiY; 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 49B0D68A4EC; Wed, 11 Aug 2021 22:00:46 +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 0959868A4A8 for ; Wed, 11 Aug 2021 22:00:44 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id g13so7848559lfj.12 for ; Wed, 11 Aug 2021 12:00:44 -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=XfCDejYprFNvSiPfOBImyMcIBXcV8sG41Qqk/wOGKY0=; b=OVw15SiYpQ9lWhe61O6uuNMHiEqWcPDUTnUrEdBQxCfGqhnh/QOUjiYJTmT9yXmusB wf/UxsNWA5EL18s3xMUTvZ1p4irVgp5IX//tqL6sz/+bFQQzj7FcbcyQ7XKhYrBTA4Yx IOMtvtxbTUyFDVa71N0rK4wQvlz2tOYGddt5vMZrLQw2NUg1/pvqrE1Pf8RsUyGzMkyd oHXxCO9GULDtJlEvJY3CVfJxiopvW5nyDelsklXF4i46DRLkiyyAm4niHwxKhUr1fd2A yXniEDX3eK/g8BGziGU19KCx18hLdAXpiWUSkzHOzpbyfVjQTWDOYiXd9d/juIRMcyDR Sebw== 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=XfCDejYprFNvSiPfOBImyMcIBXcV8sG41Qqk/wOGKY0=; b=EwjlERnqyzc85/7v9AZcB7ck3yxbLNcsssyfb/GemRLdcrucXLirwrOcLOURhv90mP s1xDgpR11P8m0Q2aVQyKws0KnwhOxulzLQuKQACWiILl8AaAK4+GdpJKVmvDCMxeSeLA OMJdhD/91XwGuoisWc8LoJiYaqs/hT8Vs1QPq1rO1dsezOT5Oi0rAJxy0cdRPsEwVhy5 LJ3yIYTAMlgklnWbHf6QJHPwjJjLvMlHOVrec846VY4D2W+dgng+JaNnqvBXAcWqXY0k pO4HZzVXVWMwfr9aMHfdBVpjFK90/hwgIGMw1+kCK3f3D7CqltYUsJ4fn1Iyitwy1y9n kilQ== X-Gm-Message-State: AOAM532WNI214GQHNVuWs4SlwaUBgNFVObJU8r5nAktYj1MJrW0bqKnz wbPO5tanY1fhi/0t7V2kVXJqCNcsI2Fw/sb9rvGPKQ== X-Received: by 2002:ac2:5f85:: with SMTP id r5mr161634lfe.615.1628708443764; Wed, 11 Aug 2021 12:00:43 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id a22sm16328lfb.253.2021.08.11.12.00.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:00:43 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:05 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.3/3] libavformat/protocols.c: avio_enum_protocols(): Move 'iterate' label 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: xqJDbnk8aq1b Upon iteration ('goto iterate;'), it is known that 'p' is non-zero, so there is no point in doing the check; it is known that 'p' must be incremented. Therefore, the 'iterate' label may be moved past the ternary operator, provided that '++p;' is added just before the 'goto', so as to perform the required incrementing. --- libavformat/protocols.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index b0aae66dab..7e90cb067d 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -95,9 +95,9 @@ const char *avio_enum_protocols(void **const opaque, const int output) { const URLProtocol *const *p; -iterate: p = *opaque; p = p ? p + 1 : url_protocols; +iterate: *opaque = (void *)p; if (!*p) { *opaque = NULL; @@ -105,6 +105,7 @@ iterate: } if ((output && (*p)->url_write) || (!output && (*p)->url_read)) return (*p)->name; + ++p; goto iterate; }