From patchwork Tue Oct 4 14:40:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp158101pzd; Tue, 4 Oct 2022 07:40:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xLnVuBf/jm6GTsGwOF5DDXVvI1TfwAxIgNI6EzgaPMMk+Nb8ZOWShikj+1vC5nLPRNroY X-Received: by 2002:a17:907:70a:b0:750:bf91:caa3 with SMTP id xb10-20020a170907070a00b00750bf91caa3mr19477794ejb.711.1664894446157; Tue, 04 Oct 2022 07:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664894446; cv=none; d=google.com; s=arc-20160816; b=WO1bxcRAMb0E8sJZpGXTqMWudQdBTcXD2lRK/OCliBdDxk+cBaQ2PYQ26+bO3BfJ0d 8ZE9ZqYuI5O6HxzAgjotzoMUYOD3u3s0JEiE5y8HUXTn+T3yR9V5JnnCXX08gF5cyKdl KMYiUbnnCwO+XK66LXPlXqo4tknhwX0pyHxcTUbokATjESlBJMqqQC7wQWehE+YK6Mf1 BTVa+ZA8QIhsVXdsLi4YWC+LiRy2/sete4MVSooZ1aq7ujDmGBzGBGH0YVf6HZtOrB45 Bm5YAxKSzSPTtTWlsn9cuDbxv6v4llBg5PNz8TAqLHoLAFcolz2Qyex4XyFp4HhQGFgg RkRA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=4x7vxdGJhjlKPB8QAHlonnYQeQeQegB1LZqkkyhsiqs=; b=HM202E5h11fnsyqpZ7fFq/Pa8Eb6+sLfMA6tk8h2qlu6/HGPHvWbk7j2cx2OSVIX2y vhSxuPWiq1b32h6DE/1rEBG96eMvRvbYIRf1SRxLZTs+1XlIuvWauflci81tDX6KCedl nB6IA51go3zxnSJA8JxTvWxbGAUnkBdqFEil6RLgVtsO/Thd0ILfPUylC75XZwxsuKmx xHmf0H7s/pmYBoHcqnYuKie5DHzE87RBFCZ6yks9Nb4DLneQ4yqsiZqbjWZUOQu5PTTD CZtjoGQy61oiG/EzmqWVAj8aG754Sloj9GWNjB/Lg2Y98js+7hPhtsQB8buQdMq8U5il CMPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Saudrk8l; 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 m22-20020a056402051600b00447e34491basi8009560edv.429.2022.10.04.07.40.45; Tue, 04 Oct 2022 07:40:46 -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=20210112 header.b=Saudrk8l; 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 8B8FA68BAA7; Tue, 4 Oct 2022 17:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16F1C68B353 for ; Tue, 4 Oct 2022 17:40:37 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id kg6so14000689ejc.9 for ; Tue, 04 Oct 2022 07:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=drL5AdDNE7k9t+z2VM1wJOIRj6ox2+oh8O2y1lXjBXE=; b=Saudrk8l+mHGaoyE5nrJ26BPqTwMMgswCmlmWRXoHUWuc+hV5BdAQmigQSQSuk/vin 7YfiZI4igdZzF8hNsZxdMUcbNJwmADdwTQz+Cyu3QJWmHaeq5uql5gpXvdMoNg/NY/H3 25XVGIjh/3g1kQJkdkySr2miVQjiVlE6gFwA4pxWXG/UYO9dR9vB06dbqYmvI5aKMkWJ m20wOgSr480yaiMyr4Hnpps3U/YuNQhivG1jiUwuwMLFc91gozcGMqPxcOWaWsI7RTr8 hY8IGDqH1pBPfevOmisTDIiNv9JGcQ9U9fudp2CTQ/Egw+SSlTo5P0lECn9TjuYrd/Tz fw7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=drL5AdDNE7k9t+z2VM1wJOIRj6ox2+oh8O2y1lXjBXE=; b=toueIZeZ+Yztnw5Aqaid7gRspzuTpm56S5FcQodTMuMxKW0BaSwMVPY3aee+Pus3m3 IMrgdIaEUfHNk7KXgoPkaQmIt5pWtkNo+GMKZU2j0V7+/52V50YCCWTLWcYrCLKKjyY7 mqv3poqQ8Ou2DX5eYEBny9ROhxt3nhZldByWiFz8KnP+XEsPHo3LPfPFVt/jQ6M1bjSx yZxzidL1D38mkWS7PhRHKLFX4eCEAZtTZ2HtthSWALmZ73UVawHEVU3I/fnvrUQYBoh2 JdnL1lYycrj9iIHGBRFLHTveFc/L9+Jyw3gebI9EsvLttbwpX+wZlvaYvbjmv2gg4ess c6/A== X-Gm-Message-State: ACrzQf2ns42o/35xj3AKkWfM1hOgdmcNFfx2nc6saQzuV+q+Ai7vXnzT zjJoS63yZz7yf/nYkk9y/XT9YeskHygnyw== X-Received: by 2002:a17:907:1c08:b0:782:a340:56d7 with SMTP id nc8-20020a1709071c0800b00782a34056d7mr19065939ejc.98.1664894436342; Tue, 04 Oct 2022 07:40:36 -0700 (PDT) Received: from localhost.localdomain (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id y21-20020a1709064b1500b00722e50dab2csm7190554eju.109.2022.10.04.07.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 07:40:36 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2022 16:40:07 +0200 Message-Id: <20221004144008.89188-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221004144008.89188-1-epirat07@gmail.com> References: <20221004144008.89188-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] fftools/ffprobe: Use av_err2str 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M2TZBBWg1aaf av_err2str which is a wrapper for av_strerror already calls strerror_r if available and if not has a fallback for the other error codes that would be handled by that, so manually calling strerror again if it fails is not necessary. --- fftools/ffprobe.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 421ada5bd8..9b7e82fd8c 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3279,15 +3279,9 @@ static int show_format(WriterContext *w, InputFile *ifile) static void show_error(WriterContext *w, int err) { - char errbuf[128]; - const char *errbuf_ptr = errbuf; - - if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) - errbuf_ptr = strerror(AVUNERROR(err)); - writer_print_section_header(w, SECTION_ID_ERROR); print_int("code", err); - print_str("string", errbuf_ptr); + print_str("string", av_err2str(err)); writer_print_section_footer(w); }