From patchwork Tue Mar 12 22:41:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 47014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:e85:b0:1a3:31a3:7958 with SMTP id ma5csp50255pzb; Tue, 12 Mar 2024 15:42:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVACDN5h4sTHxf0oq5BgzGEf8cNpSObPNPMtqrp2rSpv0FKJyI9LVPgZUfRevDxAqOHId1eE13llDFAGc0hTnCbLyPrxVYwByNV6Q== X-Google-Smtp-Source: AGHT+IFGacvzf47xdBi0sQ6gXBGKHHtit4sBBBdpAmhy+X5Vqfx1LEgyfy9816Kz4rjvXO4bYRX0 X-Received: by 2002:a17:906:234a:b0:a45:cdb2:b6db with SMTP id m10-20020a170906234a00b00a45cdb2b6dbmr6973448eja.46.1710283336376; Tue, 12 Mar 2024 15:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710283336; cv=none; d=google.com; s=arc-20160816; b=IxjLjG0WFGNO5MZDosGdYgtbN6YXNixtWF+RF5wI/4VwiCBq39Ii7tfEtnVFzTUT1N IJ8TpgZEKJYBFp1Gf9skeJaFNrRLSOy1xIAPooT+xOKoqXdKh+ri3JR3frYkTfgFFGJD TmAsv1+5yOb6UA9t4aEJKaXpb8bWO2fV917Z0TZlrVQ01/OULTmIkkuuBjKG3Dt74MF5 nvol1pAQZ0DsCp/kizXVvMxEd4WfM2ZwQsaaevr4kIdu/Ko8jpNDNH/JzdhwWRRmvJ0M GTh/f0pSuYrFNLZ6sLOqMct3MS55E1DLBqI8v+LtUjHW+BcRxiQHq502KaMS+F2+BWBg VLPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=M60dBVpZLMvdeZv+lFXtGaBw5pi56zwnBhrEUj831cs=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=W4OAhnBLiJXyYnDKjDsKNqa+IAsGspfjUxstKhRoIsD0JHW1inag9rGKeh073NPJg9 RwlcXBWktEsRy9YRAmfoefLgA0fsU+7dsAKeVhMdzLOniihjhUC0L4RNYEp98Frb16Qp +UE4u16U6UPO3jxVNjgiwXzLHnoHTsVPmYeJMEjM3nBaLQVUkcVCtDswDRkIq1w/YG33 iFPIQqn/Go2pRpghWwmo2HLKyqnnted49LWElgFERZQRcBRNK0RtD916nmohVYmNjfmQ QllWn7/oafqOCFmrWl/wHSlzN1WwXu550iRbsplotu3efvUeCTTqBZS/UweC2qtOuOvD Ycdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=FyNkNU6V; 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 oz6-20020a170906cd0600b00a449eed43ecsi3742497ejb.904.2024.03.12.15.42.15; Tue, 12 Mar 2024 15:42:16 -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=@proxyid.net header.s=google header.b=FyNkNU6V; 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 02DFF68CFF4; Wed, 13 Mar 2024 00:42:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6933168BE7C for ; Wed, 13 Mar 2024 00:42:06 +0200 (EET) Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-690c1747c3cso2908156d6.0 for ; Tue, 12 Mar 2024 15:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1710283325; x=1710888125; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=McS9CN3w2WKcgpq43wgX2uXxE+/kGsjRYueBxzBWuD0=; b=FyNkNU6VbuEVq+fkpR1514XJkClww+UlUUuNg38I/EoWYHNfF1YxV1CF9wleAw5Qc1 nlHOKUg0/XQWvvDdzxtY9hqKZIfT7Cq+IV1mA8AS/6YjKqzwasMAyM1WXT1SYCfS0r40 +ghcRAqGGJlFIrWMC4oBye7hF+r6HSVqeUeT/NpY6P5BomeKeafKw4qDNNK9vp9O9OOb 3Zz+pck8v3dGFOpF4cGWdWnzqh6rJCwEqH8BboVCghD6CwM7pHyt9D2v1Cx61wSotwaz 7NQgHU3cg22segtUaCXVmx4huOgIcUHrMtlHxrxTvzFIUbqVQyBT715rrWl/3kmn2BO3 mqPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710283325; x=1710888125; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=McS9CN3w2WKcgpq43wgX2uXxE+/kGsjRYueBxzBWuD0=; b=RWt+nEl6sHKz7+COYNubobr4Y4+hMX1nWVLKHst2CsstNpFUySrBS0dBD7W01OWj6P O5/zJhdlffhXeb5yqC2dSZNdKPBRkFlr+AQZmbkQUONz+mJZEEnEP1/uAKa0ZjGE1/6N yNo5z/JytgPpPfVNcI4fQX0GGCwoK5x3bUx8B0P5E/W0VTbPlhSrgq8nku4KBsoP8KLo +NRbpN88GWysApyTQX7tpdPvQkEZoLQOBefQyrURmgwpiQY9IFxUFtL6NO7ODU2BrcEI Hw2DHR/YEe6WAiHW6hbAhF8lkwm0CAqOuzERjCDEhzHXBAgiwRSSn1sekJdapaT3zJ21 5l4Q== X-Gm-Message-State: AOJu0YxCXwobB0wVn4ZYzmd9tAG3s/g4LTdxz/eeb8Af4Yv3x0pQHv7s Yy935Wjtx/NTleJ4D/Qlvmpwggoprj+04V5tB7G1TUleS2mRiVYU2ygcooKEG/I9598jnN5aMhY OEwZBS5ZXCObnvXiejVZa4OOlKA1EE/8+p3SCc9ro X-Received: by 2002:a05:6214:5192:b0:690:ae7b:ccdc with SMTP id kl18-20020a056214519200b00690ae7bccdcmr1347624qvb.25.1710283325196; Tue, 12 Mar 2024 15:42:05 -0700 (PDT) Received: from wsx-cc1-001.. (c-76-141-249-38.hsd1.il.comcast.net. [76.141.249.38]) by smtp-relay.gmail.com with ESMTPS id q13-20020ad4574d000000b00690b69c9ee8sm454579qvx.24.2024.03.12.15.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 15:42:05 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Mar 2024 17:41:19 -0500 Message-Id: <20240312224118.2436860-1-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/opt_common: remove dead code in print_buildconf() 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 Cc: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 66N52hrV3USQ I found this code block when looking at this warning thrown in my compiler (gcc 11.4.0 x86_64-linux-gnu): ``` In function ‘print_buildconf’, inlined from ‘show_buildconf’ at fftools/opt_common.c:260:5: fftools/opt_common.c:226:49: warning: writing 1 byte into a region of size 0 [-Wstringop-overflow=] 226 | remove_tilde[sizeof("pkg-config~") - 2] = ' '; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ fftools/opt_common.c: In function ‘show_buildconf’: fftools/opt_common.c:214:10: note: at offset [10, 11] into destination object ‘str’ of size 1 214 | char str[] = { FFMPEG_CONFIGURATION }; | ^~~ ``` Upon further inspection, I am convinced that remove_tilde does not serve a functional purpose. There are no other occurences in the FFmpeg tree via grep, and we are setting a value in it but never using. The original code traces back to 69cf626f9c1ba29e66ff62e2b835dcfc3031db8d and even there, I cannot find a purpose for it. Remove the variable and it's related loop where the assignment occurs, which resolves the warning. Signed-off-by: Marth64 --- fftools/opt_common.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 947a226d8d..e4a63f565e 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -212,7 +212,7 @@ static void print_buildconf(int flags, int level) { const char *indent = flags & INDENT ? " " : ""; char str[] = { FFMPEG_CONFIGURATION }; - char *conflist, *remove_tilde, *splitconf; + char *conflist, *splitconf; // Change all the ' --' strings to '~--' so that // they can be identified as tokens. @@ -220,12 +220,6 @@ static void print_buildconf(int flags, int level) conflist[0] = '~'; } - // Compensate for the weirdness this would cause - // when passing 'pkg-config --static'. - while ((remove_tilde = strstr(str, "pkg-config~")) != NULL) { - remove_tilde[sizeof("pkg-config~") - 2] = ' '; - } - splitconf = strtok(str, "~"); av_log(NULL, level, "\n%sconfiguration:\n", indent); while (splitconf != NULL) {