From patchwork Sat Aug 27 15:19:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37514 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp936503pzh; Sat, 27 Aug 2022 08:19:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR4pctB3/d59q5oT/pBnHUd2inGkNVQZK/O3X2HzCHwb4VS+y0YpxeWh7H0Outp+OkiRHMxm X-Received: by 2002:a17:906:8a74:b0:73d:d6bd:660b with SMTP id hy20-20020a1709068a7400b0073dd6bd660bmr7570956ejc.200.1661613578087; Sat, 27 Aug 2022 08:19:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y1-20020a056402170100b00447e25f915fsi2744360edu.603.2022.08.27.08.19.37; Sat, 27 Aug 2022 08:19:38 -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=@outlook.com header.s=selector1 header.b=onG9neK3; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7635E68B5A5; Sat, 27 Aug 2022 18:19:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066036.outbound.protection.outlook.com [40.92.66.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCD3168B580 for ; Sat, 27 Aug 2022 18:19:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KvGxTAah7oC7wwvKUWdVkXMzEhVtfzFfhnxan1Dn2wjMJZZ9t8KFlRr5r6cutE5ewYAHJL7s/QavxoQoJX8D81lDmr3zdO1ka2PDO1NSiRNeXmETrnyJenqsu4oazWoS7MYIcsRXLxyHK/aiTXF0o4spNf6LDaEO+CviidnrHWe9ihW3EipqiBupT0FwnGd4zr1aayE6uFgBOysQWkbhvP5TupxH3DDQfxFTn/M+xzaPvE7fsH9VK+h/d9JqWBM8vYI0mzOkZ8JgXsuhZZmGMknx1Zmyl8yS/u4q+1dtZCGnpiWM35JbHDJOSmXlNT23M7W+F+IdNbd0g+fvoJV6KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lS3OPktJh2D+OxWhlHNngWlYdxijGiWrpqEwGlqkpE0=; b=nPQvDMkKXW7lb2EcX9RL2qTqFkdAwDVa93YUSrCe/5w89YBQj52CPBgtxaP9HWxmIvLBu3WDpHZzxw7hQlNWoyR/5MltKeDrgzi+AANbAFimhaErwA1z8/9agC6jMCgo7muatDMszJJ8Tsckyt0CUFlTQJQBWr6bCu9ACAj2equ+S+nZL9LI+eZzH+NpveWTb1mJkzd77JnamkUaIGJFetAu0rg2E0tiaS0UDurA+FxPHgfECHb/jsaXu28lHXVjfIOJWxuweVPWXLvdwJsZvbRmKK+gQytpV0sUy4+G3fEag7ZwHgjC1AkvdKvCPfoijBal6ImCAe2kBAaYunMQiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lS3OPktJh2D+OxWhlHNngWlYdxijGiWrpqEwGlqkpE0=; b=onG9neK3D+TsDBx1w0cOdBpYR8AXI7Zz9BPGIU5QPND4DdpiFs1Re7TxglVmNXpVaNhkC3Ho3jQtHhzioGPlXtcOlxR28LiS7fgl4aaTMCKswBmLjk/vO+Gmquzc/oVJMpuoF7yBiRedhAy91YBvYXEtI2B/DdizRHURVNCtdcBSruIu2aZ9qhH6HXr2ubtjyJ1yNQ+eJE8SEvoou4NJUdbb+1jbo2KKAmWg37iTO5gzc7hhTDjeLhmS4LDw4aKHlRfikfiXWgKiHMTyAAqZvfbPP0jOxlVdfKL1uf5CxXj6BxPDIudUTZ8jB8nQsZ+nUJ5uC3LGiPikeCJAR44PZQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0101MB2154.eurprd01.prod.exchangelabs.com (2603:10a6:3:21::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.14; Sat, 27 Aug 2022 15:19:24 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::4cb9:bf7a:dbc5:fe84%7]) with mapi id 15.20.5566.016; Sat, 27 Aug 2022 15:19:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Aug 2022 17:19:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [MhPsR/EZuLEM50vr2qp2N2SKkc41ATEY] X-ClientProxiedBy: AM6PR02CA0007.eurprd02.prod.outlook.com (2603:10a6:20b:6e::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220827151916.3004323-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab1c9e4f-e829-4a5f-d639-08da883f85fb X-MS-Exchange-SLBlob-MailProps: C/ir7cSdGluuwyNECrLR46EO1b5Rr8GAq1VFsFDVFO9go9Scia2JwefszFpRtd8OrqqRXSPTMGW7u8p/XoF13HJIW4eE6aUG0VTU7wnLSjjppDsaBUPVF86bU9i4B9+wz7BrDMBrnf7KF5kbQD915MA5bZrKQYRstycI1Pcwa1AJ4bXtsRbrLNnERJEgQgCR5pAyB0snDnIigZbEw7PjShDlKzwW6bKvhzyZAgocu10fvktM/JKSLAcafT7Y8B7s2xcUfdkEu0Jtav0Qw/MAP+qh9wdqLdjaSUescmDvp7+ZgEToFX2L2AkLEhNR9K9SrHwShXr5Gu0hqb3qQvl1YcAuawUU6iwlKhEeAgAEEz7gWudaSPFoVzEmq2aCIflSPhUp7vwGRO0lPBwowasusoSUrvPN/11tZs+7FGGq+lNZ7Jel3eNLFcqIQJk9S5AeBSwFd/7SZ/eCsrQGyjE4/EgLzegVrwu84Vae5c1lcMV/j11f1YZgt0sLuT1o+9X6XuZKUKNCy5lX4RSvCnSG8yKJRgK7bMzig0R9e8YwpDGhmSWTHHMaEY0KO+6RV9g6QbKqFxd/XXCe5kXLm4dntPGuR+8Z/gXBWKoHIbzuvJHqofr4NZ62xkvbcBJ+LLTRD0FTWfdeMK0uzX8VhxXXHCBZSDNzzhR79x6OdWwYfD4xf0DEum6U8i92aLTCcOjkYqjKWAm/wryrxWAB8/Qr2i1rR9kiwu6mtkjq1+TGMw1tSpf8QXSeycTWQ7WCGMEy X-MS-TrafficTypeDiagnostic: HE1PR0101MB2154:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YK4UPn4xqvf9ZV186P1nk+7OfnKUUwMNGH6wRaQrqCCkjfj43Lpxb4ce/HobM+gNmYIMaafvNBqwoRUbMERxPAh85hJbTCftN4n76z6BpjCVdsDGjmHv6DraLXfUfMeGeqZvR++C2xg6Sf8Y6B7MEhJ9jE6IcumgDaLLBwdsy9RldnR79YWeOTysiw8a+dUzU/5AD74QLBX/SID+D4zBUwZd+X55/6rAjxHf6U/TaovzAzLzY69wKvOCfJdvfc8pL1LrAWw04RA33LGICK3AmOdJP0Fp7zVC0SXdDatl5pxya3fgBrQjD+cEXGcO8r0i0Oh7+cp+nCuVV66E5ZfX1WGvt9LjFo4Hhy8GohfrecQOQ/aRAjisrxwLidimdCRnvUbHMwaNB2Cdwx7TgpZtMQHDywG8TG/RzWwIJtteEzNgUtZ3NzcHL2lLW1+wZ6DR2Bgp5UJG1QRU2E9dgBBr7apwTwAI6XTDvjtUU+iuDBMqaIcamJrueg/vcAVuVyk8DDHhODOAJW4OqQA7QPedQ0RnCTPXmVLNFJnXut/Q+BXkzd8/bflXHE7coqq+jj+tAYqe9SX9HNVeSmGpV8O+bNRt5B0Rr13kk6DnCgLhHuwCI6d97C1XuMutkD+pHe43txJxJbfnjXzvkbogAwbMPw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RoLOiuf33Q5UhwtwK5b8OsIW0COOCtetaZesPVa0RojbwsLthCSHhASE6gWfzkkEPVkBaeodjIxbLmMMA/SDR+nOrJHjrU2e/3esuCGbrLiXLDEcDKiqOSvtxqpEfrWMB7uyPPFmR6J8d1ar0hZrmI/QSKMSfIarG1PAvvC8t/taumBRaXsfwn+1OWBZlZ+EAf57VjDNDCxYOWw0SyDedxvHdegI0pc1baS5F1vF8X566sRiBuXlc3cbIk4vITrQ8JYmDEkxS7nX4fZJwNHAqTsXLiljcvzFKW8rLWSCP5gUUHphxIHWedCFvIvk24B0xm/benA+hw8KLcM9QF/Ji5m81JV+b7AodIdcyJrFQN1bC7G45UtySXJS6+RZyJQuR4Xv3Xu+sU2jmt7wvyo/fE3KrH5px4+w8YHORuolXZi3uK6BibH4jRkJ1aWxEFGAsSAyCEiVXcSNsDmmkbGcDt9yClE8sAn806DuZmzBrrKA2UHgDJn/5qtH9iuh9jFANyCD1PdWOL1lVSW/jlu4koCpU7jZy0czJ7cOoJSETZ6GdW3sgeTUmgZuZnx9hv5qjHeWUrPekwbliNk5Hx3w19mntYWWWyq7uV8HC1zU+UFuWKLieiqn1WXoTkjnqlV3liK5t+48BCZQHZbOdgi5r0GeE0e2SgTLslKewudX2fVdboH9BdbPdeKxjhZfYFP5+cWYeTzZUMjCGw3i9q2hmR3w0ELbCBnYJwFJx5qBd8HGg+GkJt2phV1rqtTxSbAt3zRuevJ4zMbA+36jKS5PZ8Qt+bcCaF/+BuDdR9H4R9M0eTwC/lzfN3boBL6dZnZCwk26xzdpDVYhWti6yqtmkLImobWLXZJVcTrgZA8m5wbsShYbUUYJnX5yp+YPyewzrM7rgqVqCr5TeyqipbXWbE7bTV9UovCl7BIDcAYYKzdfko8/ghtXLmd9rUpynaaxNAtsh/s/hPYXP2rSTTIPQBiLTu/2XvTQl6axK/+mw0mwhEb3nPrFREapPLG81E1Yz8prx/+F+MJCAODWXD/Ga00QcuUWs0TnQtVxcY/w8/na3w4yt14XG/fG/4C+bCx0RJ0YZkBPG30lZgz6UCy5+Z/berwXQON0f4LHB6AL9uSDec8JYgop+r/HjLDVlCoMBomvHQEFwQK0j7EkiFqEHxU+Z8X3PrRbHd07No02fyJPoIPYzkQTZyqVcTdGxTS+Pk2zKisoca0Jaxy2zsMQxZKE+1m+SOxz+S8u5Bz4GBTmVdo65TD6OvkxFTD/9QSRvPoTARpkEfFKLOKjj2LkIIIPzi1ehsxnbsHbNoHPBfM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab1c9e4f-e829-4a5f-d639-08da883f85fb X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2022 15:19:24.2131 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0101MB2154 Subject: [FFmpeg-devel] [PATCH v2 1/3] fftools/cmdutils: Add function to report error before exit 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: James Almer , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9GHkHtP7v+J/ This is designed to improve and unify error handling for allocation failures for the many (often small) allocations that we have in the fftools. These typically either don't return an error message or an error message that is not really helpful to the user and can be replaced by a generic error message without loss of information. Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- fftools/cmdutils.c | 6 ++++++ fftools/cmdutils.h | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 18e768b386..da3d391694 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -90,6 +90,12 @@ void register_exit(void (*cb)(int ret)) program_exit = cb; } +void report_and_exit(int ret) +{ + av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); + exit_program(AVUNERROR(ret)); +} + void exit_program(int ret) { if (program_exit) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index d87e162ccd..4496221983 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -54,6 +54,17 @@ extern int hide_banner; */ void register_exit(void (*cb)(int ret)); +/** + * Reports an error corresponding to the provided + * AVERROR code and calls exit_program() with the + * corresponding POSIX error code. + * @note ret must be an AVERROR-value of a POSIX error code + * (i.e. AVERROR(EFOO) and not AVERROR_FOO). + * library functions can return both, so call this only + * with AVERROR(EFOO) of your own. + */ +void report_and_exit(int ret) av_noreturn; + /** * Wraps exit with a program-specific cleanup routine. */