From patchwork Sat Jul 15 10:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42736 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4241694pzb; Sat, 15 Jul 2023 03:54:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlHke1mhdk2Rln0TquGwUxmL0fLV25jWEE0wrcPl0oQQr8s6MBRlBaRr6tLz5gVXSW7AJMLi X-Received: by 2002:a17:907:724f:b0:974:183a:54b6 with SMTP id ds15-20020a170907724f00b00974183a54b6mr7949245ejc.33.1689418468461; Sat, 15 Jul 2023 03:54:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418468; cv=none; d=google.com; s=arc-20160816; b=EMwnoIM+8sjv25XkXCT3vKitDhLvUgoZaPNHTFDR3bm4MgUz7GTJEyAV32gdJKHasL diNM5jhcml0AvAL9otBzJ1chj1kZOCXYKkdkqAHZtOos9rNMDngSdEoTNP5OWddDdK+h 3hupprjkzFoO8/tGY7iXi4Eb6GMKBNny6nzZvWDdP12w6CkKacINsDo/AeTh8dScgWqb HaotnImaY1eTdxMB5WolWCNpxMh46Iyvw094heA6OEx9frNvHP2Fo33ZRUOdzHdMPLJv gWsqAP7FXxT/MlkF0hbMJZgo6+1UsWwsL8iHGNAd1f/W2SQvJfzfiLp9/bCKteoTTlqM oyYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=Z49Aq2fdYVC+HRjaD+CdDOgUhTUsR8Ja/l8fM/j7eqc=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=P4S++B8PzWLhGgXLe2rqGJVgEdSnOaVZIvcBftan00uB2kq374uLlmxOA0Kw0/62kH cTTcsVnoHZ4h+15t3S2kiA79ykTh7zWaMNtYeE1eoNW99wBDpERe3s2CqSXeGVB5vn+z mBVV4fA/bsIWepoV8SMTKyrlX05iZpekwhbuviMsjT2eBn36/povmOAme+MCQ7JUt23C qfmgD5NhmR+zTGnS2FgdWjjdZSIWLc5dCI1cCUokzQVts1IVDEDrW4P6qWNjgpN0tahE fS/LRRoinXs/AyigOogwZB5OfSlSXcFCyZtKr+5BRQVJe5GlGkiyt0q3BpNikOB59hBE 2yRw== ARC-Authentication-Results: i=1; mx.google.com; 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 j16-20020aa7c0d0000000b0051e2486c1ecsi10440312edp.252.2023.07.15.03.54.27; Sat, 15 Jul 2023 03:54:28 -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; 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 78ED068C78B; Sat, 15 Jul 2023 13:53:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4E3168C765 for ; Sat, 15 Jul 2023 13:53:38 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 58A602405B5 for ; Sat, 15 Jul 2023 12:53:38 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ufbfeB8yV5Or for ; Sat, 15 Jul 2023 12:53:35 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id D1394240591 for ; Sat, 15 Jul 2023 12:53:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 0834E3A2848 for ; Sat, 15 Jul 2023 12:46:22 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:46:08 +0200 Message-Id: <20230715104611.17902-44-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230715104611.17902-1-anton@khirnov.net> References: <20230715104611.17902-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 44/47] fftools/opt_common: replace report_and_exit() with returning an 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6rgBzzfy1yzP Remove report_and_exit(), as it has no more users. --- fftools/cmdutils.c | 6 ------ fftools/cmdutils.h | 11 ----------- fftools/opt_common.c | 10 +++++++--- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f37b7d44d6..bceb778ff0 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -90,12 +90,6 @@ 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 97e49850c5..cc2180f768 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -54,17 +54,6 @@ 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. */ diff --git a/fftools/opt_common.c b/fftools/opt_common.c index 39258bb46c..913932c914 100644 --- a/fftools/opt_common.c +++ b/fftools/opt_common.c @@ -632,7 +632,7 @@ static int compare_codec_desc(const void *a, const void *b) strcmp((*da)->name, (*db)->name); } -static unsigned get_codecs_sorted(const AVCodecDescriptor ***rcodecs) +static int get_codecs_sorted(const AVCodecDescriptor ***rcodecs) { const AVCodecDescriptor *desc = NULL; const AVCodecDescriptor **codecs; @@ -641,7 +641,7 @@ static unsigned get_codecs_sorted(const AVCodecDescriptor ***rcodecs) while ((desc = avcodec_descriptor_next(desc))) nb_codecs++; if (!(codecs = av_calloc(nb_codecs, sizeof(*codecs)))) - report_and_exit(AVERROR(ENOMEM)); + return AVERROR(ENOMEM); desc = NULL; while ((desc = avcodec_descriptor_next(desc))) codecs[i++] = desc; @@ -666,7 +666,11 @@ static char get_media_type_char(enum AVMediaType type) int show_codecs(void *optctx, const char *opt, const char *arg) { const AVCodecDescriptor **codecs; - unsigned i, nb_codecs = get_codecs_sorted(&codecs); + unsigned i; + int nb_codecs = get_codecs_sorted(&codecs); + + if (nb_codecs < 0) + return nb_codecs; printf("Codecs:\n" " D..... = Decoding supported\n"