From patchwork Sat Aug 27 13:55:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37511 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp896778pzh; Sat, 27 Aug 2022 06:56:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR44BqKzhlurOGo8pCR1p2JA+Oh/lctM1sZPI27+U/mw0pi4DgVll3UPkKXPLGeP9NaEdqi+ X-Received: by 2002:a17:906:cc13:b0:73d:d22d:63cd with SMTP id ml19-20020a170906cc1300b0073dd22d63cdmr7780504ejb.741.1661608567912; Sat, 27 Aug 2022 06:56:07 -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 gt8-20020a1709072d8800b00731646d634esi3550725ejc.802.2022.08.27.06.56.07; Sat, 27 Aug 2022 06:56:07 -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=ht1t4apa; 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 E8C8168BA0A; Sat, 27 Aug 2022 16:56:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2083.outbound.protection.outlook.com [40.92.89.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B95568B703 for ; Sat, 27 Aug 2022 16:55:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ii22NVFXOGk5TSmTdg6VrEQd2wH7AUGEG/JObTJ7vZJMG0Vzvk3D/oFtIVdcQQN6DXt+7FMB49vaQVa/No022LiM6xuSdWPpA30Hy2vggJozpMR1DBKuexm2sGSUrb9MG53hlWFjo4cttDDxUbidZew2JB4EcnaXFMrbGQf2LAO6UniqClV8GBn7p6woqmeje2L1dxi8dDuGah/RRkjtXneVEIJBfRTgKgzDA0h6Uj+K991MN0WsPYjZAQKyzuNmPTFOV67BASouzE1L51D0lMMJWRhAESdOQw5STM9C36qHb4DwiudH3TyZJn7wCS5XPNcMvk5qcALRjQ/RqL5FiQ== 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=HN+0QssWHKW1DoeYMc0zgebM0mwerA1F8IXjnMnJiMQ=; b=bdhL3eDqK0iEhJ/boT6dL1XaUc/5JAKBuddrogh+c7IzkTM4ZTK/a5Dlvtg4aMa8HJg8LSPZf/19GHEKVWoA0h+DRD8RnWOXiS/BkWEhsYNY0Hy2PhgQrQZ/rXfA9mPJVs8bCMZouSXTlXHdd64BNx/VELz8YuEOXla1iGuo089/lnhv8H9ABb0i+/HWCaForFCxAozbEwgr1/Vhy/yOX0/m8GxU/M9qZDU1j/1/Upv9WDvnmMErDi9lxRR6HkaKSJ6/DPaTS+38ibGauZa/T2UzkKGzEc7HBzL9Vhsm6omP9ehSxyUy9cYJ9bPAngQ+7ZzDlse/SMzT0If4bhBMwQ== 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=HN+0QssWHKW1DoeYMc0zgebM0mwerA1F8IXjnMnJiMQ=; b=ht1t4apauwPNoGDYnLlfIc3NQIPNl62R9va7E4TDPaBJGSo8IBYINDni+r66UiCzQ2SB+50cIK7FEJAtGL7rWdYkRqQLM32stHZEfWSp8Ecs+Cgvf4E/stZMT4M6w4QRiodSZ6gFh4a/KsYZRWkvACUprnqs+k2x/uLZBqwbznosX3pFRw7DXYqtnNCvKwYR78zIPH6RrV/xseebSir47W1n81XmCNYMEZDMt/whhOIfaawW2xRk4NpiKN3X4KXaeyzukEc6zDmj5mPtuUnNyQkoZxSfClWFGyKvRU6/5sqzuLBRxeE25dyst1k+9b33VB/K2HIP9W5f90bVO/aT/g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by GV1PR01MB8578.eurprd01.prod.exchangelabs.com (2603:10a6:150:2e::16) 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 13:55:54 +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 13:55:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Aug 2022 15:55:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [e/fV2eslbZRUOMp7Yjq3MWp3EvsUndHZ] X-ClientProxiedBy: AM6PR10CA0006.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::19) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220827135546.3000839-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a7b2a92-d40a-42d6-c35c-08da8833dbbc X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpirIBHktUo1pIdHHWKmY/vMno7oDy8qi6TYX7JeEA36l7uv+XHxFOMgFaYr77XwP8y5japSvuzhzlhjB3Nxh+U1EvTlThkYwnnyaFFPHWcEV8Bv/lgkIEO78GcnCRjSbSjPZd6/oj4cASXHXKT7NluC2MmXblaZT9fDBm79ynzUFpR2G2QFLDUti3HgPDT78Q4dO1cpMoa8gf8XFUOYgzcTzbAVb1BXGTP+j/os3qngZXFu06W1Hs45fzG13kBjKSB9hfocD/gVmHI8bHeOxYnLKoC6iy39sv6Up8kkYkBfTomPrk4aytJccPKM1xrZhgWYD6JkDQpIAJEnMirtoBeZgDVDAt7JxR1KbSIskTDpUkNalYsOSRG7VFUMj5YwbDUWQTnV8lk3jVbWCnDz7Yh7pYwxi2w9vSWEj2BYdMkStWpNPqXhDuOIIKWMMFaQey7ZjfIPzWvhuFHyPprMLv8qSo6SQhX6nu+iJUn8Rg8S0UdFelfuRb9shdmudd+7GTLBjBCek+ZKH7o4YrSnCOCQCVcDHsFUUHe2u5M7Zxh5GGKxg72mh5pz2jsDmQprNpajpdr+81qyjSWaATFV3ZdqdmQ5UOY+ufM+aeuBfn97KAF/NlCj8H/9/bZOqKixirmCjVMJ8IUS2rQpNZZfCGtuO2PQR4oOk1+xo/nu0ZX3FM4qxTuvwjVY8x1XIFc3bYl28HbuXtE2SFUvTZc0Lz0Bb4WVrIUGkynj/8gzJI7CAyZw9iscexrGk91PxyDoWo= X-MS-TrafficTypeDiagnostic: GV1PR01MB8578:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3CaPOrFG6achZfV+VutEKhNOTOsdUP/D+As4vwdg9YdAxWvWNqz17UPXcrQULv2ALtF08w/O4dpR77RVOkQjS+8IItoAy4Oc+XvGcEYIjSeFZWdBcV1aHLPHxT9Lissi6r1Slv24nsJ0D8EKunRvtoeINgxheu6keB5NDNbQS+jvDOnO2Ql7ucxsf4LG28ykLrYAZKP9whfjzJ4caVregFmz6dZkX4mdFsralI+FA/TCTYrW/OEkgYa7q5Tj8pdA3o0yS29DWpzwAbfJ3lk1aI6f5G12VyDdzE/41rITEScwD1zq+DQzNkMzTkrH7n70wLFk43qBEeds80idqq7ZiFivPT0tEwHTSAPWMYZo+IS2gVGGf+SM0Ax+nccMw2Ux2ZCMJnsVbz0cWt+vBNopXLw0ie4zyteU5gV9XTrQIkPUJgeALHjIx+pFN+0t2WraYjAlqYfjzwu60rb0I+qDSg47aJVDkpoZFrxVB1UpVhPB+kEL51EhMAaXBQaCMG8YK7E4ATqGnATyMbx6nAkkqTaekej8xLhFPRQSgBaD5eNn4/cm9uSWBWjoa2ykpReqQiGfbXKK1UXs31vmT64qGQmPwfhX+3TWdDZVy5H3nN2btVD4e3gpLBAfh0fUrZFZxsIHWs+rRUv7OeId1HZGtg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7IWhyUfOHD0esorPVcAZmT+VauVzH3Wo+J/k9Sx8BRTJQM5n82MesF5opzXAjpHPBupErjc6iFfOhfHKg7+TI/i82VMwP3DV+eFyMH4svslfRSY4gQATDIqlbhFr+LaQhCz1/DJaSLHz9716P6QkW4xlm2Ar45cujwClfNMLRp/dDqNo2CBZXYe9RRNiLvxz4qQfGfGkeCmKFqxuiyXDofh+NUdagQ/6cW8RJtEQxsHujV8uV+ndwzAMaZcSidSNJ1+kF2ayYSk6OdiTRyaD1bsxagcbyynszcFNdqZLLnxx2R3mzHXecUUQ8OjK7d2uUHpN1uEJdDSQSaFlXPvjsHDNNyRHBFWACGhYkabo3ouaeZdIktoswNHaBJLj9WUHRExnDHa/iqrBmrZFoRsGNvNqvQEyG1A6w6M/4F5fSw0vLe/0L6EtUzqrYO5WfkrVy7torfqmp8w8VrFr+3uBdFJ76Uo4jFhHZujGIxzq1EmyWMqnZDDB3P1zdAwlEUr0VlarObmHqh+PLyWwDi81CZ240KjIWguEOaaK0lnklNUYYqsGcdF9J/YiMHp9tgtLvVCy3Ih9zZi0CsWnGyOtG1uZflooNJBpd8D6j9jibhtPFUJcekyby+BialDUiVVTEUUuK5Su/se0a/1H334q1p/rr2EaDpI657mB+sMi6H28LjH/BsMVOBDjZyS+zNbgv4D1bxNbflRW9z+91hSUywt+A+w4cE/fGDZ/drU1yr/C5NClZ70N98Vdvwsbfq/FyUTYy5dqSVEBjHVjH5bY8hA2vdaiDiZiCeHsoPDu1pxy6HGCyr0KrrM24V2wCfb72Z+olrp3m7/YX4mz0KrX6v0/cBwa7dRyUolQkQJbj9pjnk+Yc9B7NBNG3W6NFPezPWw9cVr2CEdFw5cp0h0k6HWa3wpXPwitKVW/eaVVRXlsz8P6FFmpbvdqsuxlUzxysfqFm6aA4XdI2rzlwKEkPKPmqvoFJ/TqgXd7FcFdw9xF3go7MM0fj96yJGAEbpPUwF511DYRhp4m6w2CEYjlVVHxFoaVHB09d2TY2FlSNxVhbXgvj7mj3Kt/aFyvjHMFsY/i5yte4wZ43gXeestGpci8w8Mvi/LUocHFbvXfqO2yCwRHiOJXKzTF+Yjw2E8vRPVUC19dPPHcul6fJ4udxfMpvdfYhXrBh0eOHFxGWzJ/ye/ZW0fkinii2Q38ApVXxFELWXGVyxD7FKxcnfjhWvjIIXBaai+9N/S1yuybLWhovfJr7ghgZwPPvSOpmSSSNnel8UI9VIMt7VJVRYVlTU6vj4d784C6pE+2c5ftDa0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a7b2a92-d40a-42d6-c35c-08da8833dbbc X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2022 13:55:54.2011 (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: GV1PR01MB8578 Subject: [FFmpeg-devel] [PATCH 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RtPXsm40/+xD 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. 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..b6f5c01ca3 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_error_then_exit_program(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..358f0a0ef9 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_error_then_exit_program(int ret) av_noreturn; + /** * Wraps exit with a program-specific cleanup routine. */