From patchwork Mon Jul 10 08:07:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Kai X-Patchwork-Id: 42582 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp556605pzb; Mon, 10 Jul 2023 01:07:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlG0PRqSnnGiqd+yn+bQ9BNoW5R2332wcgwydGvEsMuVkILKJ5IQDwJHqPZYaot1+yPzhU0+ X-Received: by 2002:aa7:cd92:0:b0:516:81d3:2627 with SMTP id x18-20020aa7cd92000000b0051681d32627mr12980798edv.0.1688976460824; Mon, 10 Jul 2023 01:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688976460; cv=none; d=google.com; s=arc-20160816; b=tTBW1ezhj6S8GsIbUvx5XJRjJdU/hn7B7Y/xgA2zVVW2TxecVXWPXxNAKtjui6NEh7 DTqM0JhWjZaKGQh6T94IdK0dHNZkoOIavQtw8vQ5TbcTAkKbIMAmN2zoXuOB3CA+FTKz MBzfw+rcs0muheCvNN/blpsZOB962SUV3/CEqX/3byYsJJ6PfRT+qxBxUUS3B0LSOrjY sjs5gXuB5ktCx78DAQ6C+WxxUoKPXmdTscTrNeiEuJqMnYwiWsGSISNBlLHYRWPqA8Ny btLZis69XImjAD/eQ1KalCMRARcQPAXFy0KO74a6eeFnxEAphP3BQpnfFf6c89tGSyt1 QiBA== 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:to:from:user-agent:mime-version:date:message-id :dkim-signature:delivered-to; bh=0h+zJZ0DeN2h97Zx+FNe38YvNCPdjroy4y2KVBi1szU=; fh=kPzAvv7+le3p+0UKp2/psXoq1MOxB3N+gRp9FnlPCM0=; b=dFOsUry/CWzKCUk0MyOApZTe0mmNwO1ZUviXokL/yGSICYFVxUTE1ZUjZ+k3SyFM9M 7zavQp0e1MODT8QkxNVR31r7pGHY3A+1r/BH+YFBPpvuRoGpItJ3qXhj+FQjLK7Pk4DA 8qChNMshzNh8mBHG6pEqqMwRXuRSKqH1rz5Uv8MHZlP/i8NvJgrTthKFdTy85hRMM74D 5lmdjroiXX/q6vvQv7UTCdAZZbCcNyDQZ/pY+1UaPPy2kLkbhwtymJSRx1vpqmKFDRNc KT2mzy5Wm3PZfBAptwfpWYQMz3G7vUnUJPpU7NHXt5LYjN9+dPVluPgEcYKAIf5WY6Fr unTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=m2jxo5XO; 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 d19-20020aa7ce13000000b0051e3d383697si6688881edv.504.2023.07.10.01.07.40; Mon, 10 Jul 2023 01:07:40 -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=20221208 header.b=m2jxo5XO; 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 095C868C4F2; Mon, 10 Jul 2023 11:07:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0958168AE76 for ; Mon, 10 Jul 2023 11:07:31 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1b8bbcfd89aso19790035ad.1 for ; Mon, 10 Jul 2023 01:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688976448; x=1691568448; h=content-transfer-encoding:to:subject:from:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=cAWw5DZF7xqOzL0k4dJ/dK66tU5y7AHbEVNyjN6mjQU=; b=m2jxo5XOjvZieghK/PeKoj/1ZorkALowslTR6fROqcf7Jia4YWB4xZMLtoduHwGS7n A2gW7dtqIhjThdKofeFuZpgC8WdUe49j6lpcu0lNgwv45Q1fgvRXtmPqDFmORHwKTqEx iJTwodry46DtSIGQ84DiJ7aG1GxTis3AVLEwanW6cBdrtSjr6oWtPBp2r6xPlYCzoNLO a40THCxFvEhqaYLVJfEjpALDrsIhvk1GPtE8uFHMXHuIcZ4+u1C2EF0Z25w47+Xy8+9K U0WAWcJ+n3wRN6UCgBd2BnJRzzsRNMtA/6Ka5GGfYVc3FbEidcMuPd33XYckjeHrdFBW SxqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688976448; x=1691568448; h=content-transfer-encoding:to:subject:from:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cAWw5DZF7xqOzL0k4dJ/dK66tU5y7AHbEVNyjN6mjQU=; b=YGsaPZOa9eqRUAYzwJGQKMD4RdxcdjToUgBLnzwrBkJqZdSLVPTDnT4+4iD2Fkg9d1 ANdXazemFIdTF6vVYIEe0JPPKYqurnPBpvzmSaUqaNcTsMiJx9iiQcX3zD+DQkNgVBhk d6GSQJWN+i1HHOyADw3P7kJx/FvS0L9ZISzlGbwLkv3wyfbz33nZejrDt0EA0wW6uDFX ywsR+nde1t5cY/b4c/gfQNKFCRRThc5PI6EpjSd1po2xeai3avy0zuXxZ5CZB1L8l1M5 wxscuqU8xwLYTDBFGeWVqFIJCXAJzK8OWgs/c4LCSDFiHMsHb6yOzqqWWYPvy5AR2nf1 tEWA== X-Gm-Message-State: ABy/qLbcdZYnVtMJ0QgNdTI47Sfa45IFcwUK7faFFDZDEaGC0dA86igD EVhAAkFpqLnX41q959YawZCFWSKFoTL+w1V+ X-Received: by 2002:a17:902:6b4c:b0:1b8:865d:6e1d with SMTP id g12-20020a1709026b4c00b001b8865d6e1dmr7432655plt.51.1688976448195; Mon, 10 Jul 2023 01:07:28 -0700 (PDT) Received: from [127.0.0.1] ([92.223.105.162]) by smtp.gmail.com with ESMTPSA id f17-20020a170902ce9100b001b9dfa24523sm1651927plg.213.2023.07.10.01.07.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Jul 2023 01:07:27 -0700 (PDT) Message-ID: Date: Mon, 10 Jul 2023 16:07:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 From: Li Kai To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avutil/error: uniformize errbuf size by macro 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: MEbVSCkJ4/Aq Signed-off-by: likai --- libavdevice/bktr.c | 2 +- libavdevice/jack.c | 2 +- libavformat/crypto.c | 2 +- libavformat/network.c | 6 +++--- libavutil/file.c | 2 +- tools/aviocat.c | 2 +- tools/ismindex.c | 4 ++-- tools/sidxindex.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 196637852f..a24b80a4bb 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -106,7 +106,7 @@ static av_cold int bktr_init(const char *video_device, int width, int height, int c; struct sigaction act, old; int ret; - char errbuf[128]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; if (idev < 0 || idev > 4) { diff --git a/libavdevice/jack.c b/libavdevice/jack.c index db056d824f..8150a91f13 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -289,7 +289,7 @@ static int audio_read_packet(AVFormatContext *context, AVPacket *pkt) av_log(context, AV_LOG_ERROR, "Input error: timed out when waiting for JACK process callback output\n"); } else { - char errbuf[128]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; int ret = AVERROR(errno); av_strerror(ret, errbuf, sizeof(errbuf)); av_log(context, AV_LOG_ERROR, "Error while waiting for audio packet: %s\n", diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 1d4514e0f2..41391c7a16 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -314,7 +314,7 @@ static int64_t crypto_seek(URLContext *h, int64_t pos, int whence) // if we did not get all the bytes if (len != 0) { - char errbuf[100] = "unknown error"; + char errbuf[AV_ERROR_MAX_STRING_SIZE] = "unknown error"; av_strerror(res, errbuf, sizeof(errbuf)); av_log(h, AV_LOG_ERROR, "Crypto: discard read did not get all the bytes (%d remain) - read returned (%d)-%s\n", diff --git a/libavformat/network.c b/libavformat/network.c index f752efc411..d02ec65b8a 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -282,7 +282,7 @@ int ff_listen_connect(int fd, const struct sockaddr *addr, if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen)) ret = AVUNERROR(ff_neterrno()); if (ret != 0) { - char errbuf[100]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; ret = AVERROR(ret); av_strerror(ret, errbuf, sizeof(errbuf)); if (will_try_next) @@ -416,7 +416,7 @@ int ff_connect_parallel(struct addrinfo *addrs, int timeout_ms_per_address, int64_t next_attempt_us = av_gettime_relative(), next_deadline_us; int last_err = AVERROR(EIO); socklen_t optlen; - char errbuf[100], hostbuf[100], portbuf[20]; + char errbuf[AV_ERROR_MAX_STRING_SIZE], hostbuf[100], portbuf[20]; if (parallel > FF_ARRAY_ELEMS(attempts)) parallel = FF_ARRAY_ELEMS(attempts); @@ -586,7 +586,7 @@ int ff_http_match_no_proxy(const char *no_proxy, const char *hostname) void ff_log_net_error(void *ctx, int level, const char* prefix) { - char errbuf[100]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; av_strerror(ff_neterrno(), errbuf, sizeof(errbuf)); av_log(ctx, level, "%s: %s\n", prefix, errbuf); } diff --git a/libavutil/file.c b/libavutil/file.c index 6a2f3aa91c..0477b821f0 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -59,7 +59,7 @@ int av_file_map(const char *filename, uint8_t **bufptr, size_t *size, struct stat st; av_unused void *ptr; off_t off_size; - char errbuf[128]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; *bufptr = NULL; *size = 0; diff --git a/tools/aviocat.c b/tools/aviocat.c index 816ab700ef..969a883011 100644 --- a/tools/aviocat.c +++ b/tools/aviocat.c @@ -37,7 +37,7 @@ int main(int argc, char **argv) const char *input_url = NULL, *output_url = NULL; int64_t stream_pos = 0; int64_t start_time; - char errbuf[50]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; AVIOContext *input, *output; AVDictionary *in_opts = NULL; AVDictionary *out_opts = NULL; diff --git a/tools/ismindex.c b/tools/ismindex.c index 39b5378190..7778c92797 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -148,7 +148,7 @@ static int write_fragment(const char *filename, AVIOContext *in) int ret; if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, NULL, NULL)) < 0) { - char errbuf[100]; + char errbuf[AV_ERROR_MAX_STRING_SIZE]; av_strerror(ret, errbuf, sizeof(errbuf)); fprintf(stderr, "Unable to open %s: %s\n", filename, errbuf); return ret; @@ -499,7 +499,7 @@ static int handle_file(struct Tracks *tracks, const char *file, int split, { AVFormatContext *ctx = NULL; int err = 0, i, orig_tracks = tracks->nb_tracks; - char errbuf[50], *ptr; + char errbuf[AV_ERROR_MAX_STRING_SIZE], *ptr; struct Track *track; err = avformat_open_input(&ctx, file, NULL, NULL); diff --git a/tools/sidxindex.c b/tools/sidxindex.c index 88aea6bcb9..bd02f74a96 100644 --- a/tools/sidxindex.c +++ b/tools/sidxindex.c @@ -118,7 +118,7 @@ static int handle_file(struct Tracks *tracks, const char *file) { AVFormatContext *ctx = NULL; int err = 0, i, orig_tracks = tracks->nb_tracks; - char errbuf[50], *ptr; + char errbuf[AV_ERROR_MAX_STRING_SIZE], *ptr; struct Track *track; err = avformat_open_input(&ctx, file, NULL, NULL);