From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E255143EB8 for ; Tue, 16 Aug 2022 23:41:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0484268B743; Wed, 17 Aug 2022 02:41:23 +0300 (EEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9CE168AE45 for ; Wed, 17 Aug 2022 02:41:16 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id r16so5145583wrm.6 for ; Tue, 16 Aug 2022 16:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:from:to:cc; bh=RRVQ0KbgCdmUAJ6l8ewJQWLIGVNwDGhaCPOMyMeeQK4=; b=dDdZO3eW3bMqF3Lm7G4R0iBk97eogDE/O5YtXgJ3cgWX1znph3PD8TBRSrAals12ML ndqP4XEhNFA2Fm55OivudHxneD9Zx/2YjOIU79IClwOW1GgzzMKrA8J1DQ7NidGcEBug VJWK/IPpAXm7hG3p+XL9SbpE3b6bnBx5RAGEjxUtanceRqpqFZJFDIxjdzfdKdYJpOxl 5gF/+qIkF/Rn9BRNBQsk7rOM5LoxoHKC/Cy2bUen7VlYLDNsdV4SGhFR/ql8y2GKxWKf UTuMASa0wFhligKX3bPOzgRXYyFhAFt5Kqte7Fip4iZKzmL2M6Yl5I1XifNMkvm32m8n g0QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:x-gm-message-state :from:to:cc; bh=RRVQ0KbgCdmUAJ6l8ewJQWLIGVNwDGhaCPOMyMeeQK4=; b=QfwCT8QHRxgc9BfH/oO1kGgW5ldChHRLfDr4Wsc6Mf5xfUR1Ee42ZBszQEWzfMFQtv TouhfeQOBTPhbjT7otSbQkIM0oZsP9Hk3NLdDfz+3JSsii0gS6q04qDbc4q5KZLVCWwX AyjXUUtjRReP2uHJ+JHeQZW7912MJWZxWfwOy2d51JX8s08XH/rGlM5F4vhVUe3GAGK/ 94Zdfb68MT9CBlAufgCvLzYg4KOcyiTL/rA8jj+a8ZDYbonrTSsjlab/JseKQe/8G0wa 2RHv+8zHiZc9ia1wWkr3nWOY8bfzc/cW9N0coEx2kJtNT0um+zLRA3fKAFYa/gtm9MZs Xb0A== X-Gm-Message-State: ACgBeo0XmFyd9Bu/pWtZ+ZtrrXr3fLrUlc/TIi1cTonSFNwNw8yx5OWC N4i1jhPmOGgNVSQhaFNrp4lF1Fv3gi26yw== X-Google-Smtp-Source: AA6agR5HI9ebe2BJNFo9jDpV8m8e9Oq4Y9AQCEBCr1+E35NBNxruZKCbGXVv2K79KCfmkG3nhfxXTA== X-Received: by 2002:a5d:60d0:0:b0:220:4e23:9934 with SMTP id x16-20020a5d60d0000000b002204e239934mr12701490wrt.474.1660693275944; Tue, 16 Aug 2022 16:41:15 -0700 (PDT) Received: from mariano (94-37-135-74.adsl-ull.clienti.tiscali.it. [94.37.135.74]) by smtp.gmail.com with ESMTPSA id bg13-20020a05600c3c8d00b003a38606385esm5208530wmb.3.2022.08.16.16.41.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 16:41:15 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 44590C071F; Wed, 17 Aug 2022 01:41:14 +0200 (CEST) Date: Wed, 17 Aug 2022 01:41:14 +0200 From: Stefano Sabatini To: FFmpeg development discussions and patches Message-ID: <20220816234114.GD3168@mariano> Mail-Followup-To: FFmpeg development discussions and patches References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.13.2 (2019-12-18) Subject: Re: [FFmpeg-devel] Patch: fftools/ffprobe.c: avoid overriding error code. 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Related to: [FFmpeg-devel] [PATCH] ffprobe: restore reporting error code for failed inputs On date Monday 2022-07-18 20:40:03 +0000, Yubo Xie wrote: > fftools/ffprobe.c: avoid overriding error code. > From 7c28459fa1e8d0a375a239257601bb4e47460053 Mon Sep 17 00:00:00 2001 > From: xyb > Date: Mon, 18 Jul 2022 13:31:51 -0700 > Subject: [PATCH] [fftools/ffprobe.c] avoid overriding error code. > > --- > fftools/ffprobe.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c > index f156663019..cdd62de696 100644 > --- a/fftools/ffprobe.c > +++ b/fftools/ffprobe.c > @@ -4026,7 +4026,7 @@ int main(int argc, char **argv) > WriterContext *wctx; > char *buf; > char *w_name = NULL, *w_args = NULL; > - int ret, i; > + int ret, i, ret2 = 0; > > init_dynload(); > > @@ -4151,8 +4151,8 @@ int main(int argc, char **argv) > } > > writer_print_section_footer(wctx); > - ret = writer_close(&wctx); > - if (ret < 0) > + ret2 = writer_close(&wctx); > + if (ret2 < 0) > av_log(NULL, AV_LOG_ERROR, "Writing output failed: %s\n", av_err2str(ret)); ret2 > } > > @@ -4167,5 +4167,5 @@ end: > > avformat_network_deinit(); > > - return ret < 0; > + return ret < 0 || ret2 < 0; LGTM otherwise _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".