From patchwork Wed Aug 11 19:00:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Witten X-Patchwork-Id: 29427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp46513iod; Wed, 11 Aug 2021 12:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLzd3HLnan3glVzgokkKa2+mtEiQAqs88T3qqUCcugqJt3w2Fum4ur0aQ7FcfdmFGzzK8Y X-Received: by 2002:aa7:d511:: with SMTP id y17mr421500edq.341.1628708574877; Wed, 11 Aug 2021 12:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628708574; cv=none; d=google.com; s=arc-20160816; b=jCRolPGVfG8oIfcntH1wuM9cydXGYL2Jw8yyz5XNieS/At+rtPDZq8+s7rCoXkILsl JnFaJWVoy/652fMvK5mNa1B460Pod09jPmv7DM9drubSk4OAeVdKLSTF7/54iMPi/K6D 9+fWx71XRFtKUVUBDwGNILSYwIpoNHlUPsRgxzow8xg6z8yc2T2jnB4Ve5OAIgwgW1iy vLugquWe2zmR1PEZ2feOMEQKtE4j2/32vCJSAhK437c+/vMjrJNzvM7Y36kUqeS76YnE 3LyCn176KhDCqt/IJSxchjxjthUJXyBYdA6jOsu+YPLw0xDl6RtaCfkkaG4J/YDnVdHS vpHQ== 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=b7tH9/E+3vKwaCzthvSh0pIaPb1HlAX/Dx06uq6mw70=; b=dX3wm3qvmjlMoQWtandqX9PLrh07KLHbzUiWI9tKngSlzLGrEcPKWACnxhQ9FXqijr 7Uci0uLJXj4U/OuV/YC2yQMrWmnjEm15uZtDbDQHQ4ne5btSAXmjDpnpn9LPQwY05+4N CnGBaFSX4hRk//GWdBJFEoTK11qrNjZtChhVxz/yAaDzTRTqiZNJuAur+SyHMHvJElRC RVrUjplkx8q/hlw+MagwEfXxP72ML9n27YU6SOp5kHu1I0K48rjxYdxPtAwxNPKBXiJ+ t8eF2YDSF8x2UAgCDNly1Lg+uVNlNpMm8FavmGI5sfZo2IIK/Nxw2rHdYClRNKN0PswC uI8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rVR4xnMl; 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 u4si167794edy.419.2021.08.11.12.02.54; Wed, 11 Aug 2021 12:02:54 -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=rVR4xnMl; 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 90B6868A609; Wed, 11 Aug 2021 22:01:38 +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 CF72F68A4A8 for ; Wed, 11 Aug 2021 22:01:37 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id u13so6274968lje.5 for ; Wed, 11 Aug 2021 12:01:37 -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=PihTJE2lAw2pTesrIOFBQCmKbTa1npxcI1ml597VY6U=; b=rVR4xnMllyu+/o0/DMrbKXRi3Rafd2o+qgD38qmYclZuG5ti+r3rwjN+E3GkCO1Myj ECRN/k01uaUVsDVBhHsfUmhF0JwwnZ6zGt8hy2+8AC2k5WUWLnTniS1mT7RDpPzKSlNX nEG/mk/3SpCRxLPs6v0Ftw8qhRLWFJMoct7Q+pqLEeOp8MPofoWVYYM89lWAK5GbIctd aeJdRkP8aaInKbAP+NRsWXFJbh5MRMhpLAF/s599OYUEzOo/n5+qCA9RP59nzP3bu/aN Pnw0rOwwTf6dCqLfxliV+/RPKmVSGRtwg7oGzO6i2NKIeJMwvLBCy+iJx7Dxssgu8i5O ABIQ== 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=PihTJE2lAw2pTesrIOFBQCmKbTa1npxcI1ml597VY6U=; b=GHIbvuE8ZtsWzdt9GUYP5pK+PnlTnWRwQUAGOQnB39FrVGSoxsQyweEDrPe35SkdVk icumnemk/kc9gnV3kMHjI6BSVws8hFXoWA3xhmOcacj11Ar9du1LDcfvoRj88Uf8gWBc 3xUjTCoBVitDRETp09UxWg+0Scz93KHKAvxvCqwwu9QzBBofqPoQM5zgaVTfsY78biQp fQOHXXsM315aqE1afMmrHpAqP/0NMa4RfTpUVWRVe659bPtcLpsyLf5XkAN421lOXLUS /j8dQGLS4mrrA7Adb9jEh6d+HZz1PqBC0MTWViwa/yayqiUpXGkwf2PMgpaNzKvuVtiw IbnA== X-Gm-Message-State: AOAM533IE5oMh2lnV4Cq9exA6UCqsNOH3h5JnIrup7ekUnyDbJCAg7MI RiIOmfoy5TFrrOrfDYMU6IuEQSSFn/V/Si6/yTIU1A== X-Received: by 2002:a2e:a4ab:: with SMTP id g11mr106214ljm.273.1628708497027; Wed, 11 Aug 2021 12:01:37 -0700 (PDT) Received: from gmail.com (tor-exit0-readme.dfri.se. [171.25.193.20]) by smtp.gmail.com with ESMTPSA id s1sm18598lfp.77.2021.08.11.12.01.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 12:01:36 -0700 (PDT) Date: Wed, 11 Aug 2021 19:00:14 -0000 From: Michael Witten To: ffmpeg-devel@ffmpeg.org Message-ID: <3c6dd20cea674a09b98ec09c0f81b96a@gmail.com> In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 2.c/3] libavformat/protocols.c: avio_enum_protocols(): Move the loop variables 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: xLaJmXxKwE4D The loop variables can now be moved into their respective slots of the 'for(;;)' statement; this removes the need for the 'done' label. --- libavformat/protocols.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 2aa302d08f..e3cde9ce02 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -95,19 +95,13 @@ const char *avio_enum_protocols(void **const opaque, const int output) { typedef const URLProtocol *const *Iterator; Iterator p = *opaque ? (Iterator)(*opaque) + 1 : url_protocols; - for(;;) { - if (*p) { + for(; *p; ++p) { if ((output && (*p)->url_write) || (!output && (*p)->url_read)) { *opaque = (void *)p; return (*p)->name; } - } else { - goto done; - } - ++p; } -done: *opaque = NULL; return NULL; }