From patchwork Wed Feb 21 15:58:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b29:b0:19e:cdac:8cce with SMTP id ch41csp393886pzb; Wed, 21 Feb 2024 07:58:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVpqX9Po5YSyhitGjf/yVgX/JxmaDr3wY6BMe2C20s3fpnZ1uGInQ6VW4+KHU7XuXuT8P3VI9Zby3EBo5yjIT3REFYcklPWl+dlEQ== X-Google-Smtp-Source: AGHT+IHy/MLAqlldts9M2WSpanuuUhRxx+aWgCdD8ti/38jUJv0eN+2TMDBNgXfSATmnhIfFBLr+ X-Received: by 2002:a17:906:395b:b0:a3c:36ae:6c96 with SMTP id g27-20020a170906395b00b00a3c36ae6c96mr13149956eje.42.1708531113042; Wed, 21 Feb 2024 07:58:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708531113; cv=none; d=google.com; s=arc-20160816; b=xW9VaM8bC126j8ruQLZpGPvKLR6Fhnye5QPOnilJ1tFsADRsjGnsaL5tIelCiZuyvD Sbd8CNuKvC3fPjPexJR7Sma0LUQ1W53J0es4Kihb+u44kayPlEg7IlaBib/ZItQdmnRg uq3Ea0aS2GcJCKAXfa8jhdtWtr4ZPy5w8+RrcImF46q/oR80l6yAzNu6uBNi2iOiWSdS zUaWcFwhbehoAJjPVWzs/evnwIhRjQfqofeTebYHjireywaSxBegEIRI1BCkgcjvdMIi f6AZyBeO7sp34QVErYZ10KoYxjUTRiwRNtGD7FDg1sq8saoi8Jdyn2WRRn7DdERJY0ie D89g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=1WInQL4Y3sVTK8apUVU47hco1/49G0dMTFAHYibDmus=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=yCTci9gw76MA33aIocK8pT9JSxS86ChvbyA6TcRzetyU6sM8b6TvdaphYzbk8FTKrT tCteCaxvbMmhaowbrvkNlZDyqZtQYaEUWL8l/7aBJ0r79yMo2DjPBfthjggzTghu5DiM w9o87wX/lEW7teZTHeiYS1GuA3bL3V9aCpaQK8tjRvM87uEGS0E97f3qDCnkZnGfJKIA defC3l4k/RkWxKCP5wTN6TIPP3TjZ14ps6FfoImnDGieZLxTpalxzy6Zdt1O0rXoMVlm h+yNJyGMVQAyGCpLza+xtK2AsFOm7p5be6c3mHo1CN0oF4aRI7uhkmx2qITZLNLVoyAA awyQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=ixvYWeW8; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n2-20020a170906840200b00a3e5952b3ffsi3447637ejx.75.2024.02.21.07.58.32; Wed, 21 Feb 2024 07:58:33 -0800 (PST) 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=@khirnov.net header.s=mail header.b=ixvYWeW8; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0E0768D0E9; Wed, 21 Feb 2024 17:58:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2738468D03F for ; Wed, 21 Feb 2024 17:58:22 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=ixvYWeW8; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 8CA394462 for ; Wed, 21 Feb 2024 16:58:21 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 1DmfkJkobMCo for ; Wed, 21 Feb 2024 16:58:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708531099; bh=7WI6Mhc/ileEDug0rfHs5qbU32qZDo7PIwKsIm6Pzms=; h=From:To:Subject:Date:From; b=ixvYWeW8NQBljWpJyF3iAARHpwAcMxBxg/FER40NZN6nkNh4ErlzRLXBQNPs1A/yq 9J05+NkLy6Kt4geZdv1eH1T/ZpUW0O8/18o/e6cO+OFC/E3p1secSXiCygC+gz8+xz EDQiZx969u9qu+UH8+3edmkLr8vrLOjXshe6/hepJdneB4gxanquucEYJDX/URFuWe lP9UncHyJOWhJn7tqU45DyvZAAihghL34g2hket0PyXxH2dxuHu9vSzT7m8XIc/+yH 6ff3mX3e1/h4wgBlsfP8+ogCdvS5QLecMmPV/Q2uijjmwYU7jx/wQa6s5JalJvxkK+ q2GeFg0UBfP4A== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 07C55FE1 for ; Wed, 21 Feb 2024 16:58:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D692B3A0327 for ; Wed, 21 Feb 2024 16:58:18 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Feb 2024 16:58:13 +0100 Message-ID: <20240221155813.27298-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/cmdutils: remove harmful variable shadowing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ghjEb9YGX5t8 It causes write_option() to return 0 when calling func_arg() fails. --- fftools/cmdutils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 5e181a0d85..3d613a4018 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -339,8 +339,6 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt, *(double *)dst = num; } else { - int ret; - av_assert0(po->type == OPT_TYPE_FUNC && po->u.func_arg); ret = po->u.func_arg(optctx, opt, arg);