From patchwork Mon Dec 6 01:12:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3913664iog; Sun, 5 Dec 2021 17:14:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzLkNOZ82FIltfyN5ebSxcxUdHv1DdcFtrhVW9vZRS5SX7KO8Ya4ImW4lbqf1DJVuWhsSSH X-Received: by 2002:a17:907:7da0:: with SMTP id oz32mr41037593ejc.176.1638753256543; Sun, 05 Dec 2021 17:14:16 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ht9si18269535ejc.620.2021.12.05.17.14.16; Sun, 05 Dec 2021 17:14:16 -0800 (PST) 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=kdGqjB3v; 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 B134D68AD8B; Mon, 6 Dec 2021 03:13:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074036.outbound.protection.outlook.com [40.92.74.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 721C568A78A for ; Mon, 6 Dec 2021 03:13:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GPbbZRWRdg5MiyuA5D2yO3j58kov3re7FJurHPzxOdevnE0tF4R1oELHPnBO59m/Ra8eE3jwskrdnBWAOO7ZTUMd0YKjW7LNluCskIYdWIklpRG++jYtEDVeVb6YfokoAVKlXNeKO1TRM67KBoHMb/vBzVM4W3XIQN+GkkVHJ1kAnlAx7pBy2Sfy63zvltYeiNBxsCkIIka3cODwlZCpZZizW2Yjz8VCmUwnaunSmqOzzm8HJKufwvX7H/QODW5dRxCZrzXYjDmO5rtOMOzgl962LEGe81cbqPjZK6elP2geaih1L9VbkSkIXz1MgDoPoA5h0srktrO8jIjBRwdF3A== 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=5LSshc9jQ3YyUW/zo1+v2urSJsBvY9scyZ3oPNMG5rc=; b=mBX7xxaWNaAnRq0ObnvSwOmXq1VzPTD8YNHKvViwtqNkcj3aUNrPczVXACta3Qw8gpsvexipAJfvGD68VaOp4fhgmBuNIpZDuwrf/XwNrMHnKV1WCP6K2irleE+NISIBCe/jOuzB7xWRi51nfgLC7R1bCyb67dkT1cEytltOczHEKlNArfjR6rC6NN3prqUQdc5sV4fzjFF8rOaxqohF9Uer+7JQNB2IayuyEPEW5EGE8xaiJqUXSGjwV7YU38aOvQAKpbruTO5pyBXoetiaXmojKn2m5xUnjl8tTmnblqTNjsC1zediZnE6iRcVlsnLs2uYjJUdrSJ+5oKDgK/rxw== 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=5LSshc9jQ3YyUW/zo1+v2urSJsBvY9scyZ3oPNMG5rc=; b=kdGqjB3vs/n/rAA7tZLuhHyZT7VJMQwuHl+6xBufNixxmilVr9VCI7Ttpkjwa0lkA4zB46KW9I8Cry5yK2HlcDuomxWoFiL/LZKVHU12x/Gpliljk8aU16aIUIxpMF2meOS6JmJLECZemGHHCuLhF2o4BlRLPasEYAleAPMksDWe4oPQabsQhsblNJ/RWxhkYpgVubhRtH5t8bidgRG7NqiVPcqGD+HHnYQMhM9vcC89xM124Gxq7JZHQA3fWkh9J7tzgGUj7AhelJODB2yU9Lg6McGXmiL7s72WOhzT7JlnFLAqWDwcz1GdOaX1R75/iQ0HotJdfGBf6B1Smk9xRg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3686.eurprd03.prod.outlook.com (2603:10a6:209:2d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Mon, 6 Dec 2021 01:13:14 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.021; Mon, 6 Dec 2021 01:13:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 02:12:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [9avbDoUaimnTuzF7PObU7W3fDQZJwIQS] X-ClientProxiedBy: FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211206011246.239514-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by FR3P281CA0055.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Mon, 6 Dec 2021 01:13:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a6fe688-08d5-4cbe-d099-08d9b85593ea X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT2s5ZWgpZq8Fu1c4CoKhX6H4mv5aHVxIHJ+iHxA8UA7tU1rTnh/jRDJuvsbr2jE4KKAopn+lPZPzWaWPQVT3+hdeRQ2H72oYeLuG30VaEXmOYFeo0esJIyKB5GMOxMfsbuf+Z2X2RREl9lqeodxTadSURzkj4XyoUmMIU/jHh9oZJMaODHSepALQyc3SPE2TGUIIFc2OkXgQncgDgQLWTjDBBENOuRGjpPnAXQ4LWUgS9C1/oQEPpeLesgv9ZysoW9mvUXCLdhCtGwneq5EfYdAg7SYZPp3hO0dEx4SHDczI/tv8+S0qLNmerM8HswOoixwSyL7alWR3U9S4s/KsxE6nESKrs9OrMWXMBZgiz1RQijMgjtS8mo3zq0pUPPD3AtRv10wTYzQcxv3gft3nnpgW+t1Zxe/wyad6T/I1x3yCrxG41pkkM82FGGne3kKffIhsOj+BaQDpIGbKXanFdp+FGNQF35So7qzPv9bFtuLkRske5aMVmBqvd0t+43s4/GY3ClQWRyZNtFZw9/Kaaaqy3KkvX3nOOX1m2WsumlzLoIjx36s8ukAONEaFDu2KE6rQTQhGfay1yT/i+ArntXnzuBrgRZ2U4c5zqC2xOBD/HixcoSuZ5FsQ1+2LmL2v62qs8wBXqywzObfWTDcrPxGxFVT3NgOgm+KDZfpHOMz3cvSpiiJEIyvJztZrRFBBa8pu5QzM1OEuzLD7L3w0tw3NKTo+rB67+XejEc7zqF3Y+qab2eqlk00fnnlixAtn4= X-MS-TrafficTypeDiagnostic: AM6PR03MB3686: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZJ7Xy61UnsTVOmTQxAFoWBtWOEFM4GhmExfy+NOQOzG4zu44Wg/BjHGiZXXXMjAtcomy0cr9CNRsZf9NQQLgnjeeYV/iyCxCyVjvSFyuNtMmEViR40PR16dtHdeZsKQ1ezlQ7YTN+NmVDILrpw2XO5z1aPXAva6JBaHciaXAElTM/pEZoA1bwJ8jhdzWZA2bYMK23sXLvg2EfQSrH536GaifHjbV6xhBLLjNwUeroP7WuPmagyin+dvx9OXLhK6aCBY7VnTdcGu36BcSGjyJjWy3Ga+3Z7BDklno99tX+Lo9Pj2VEyNgOSNydPDT4ITtNj+qXp3TysKdntBWcSdAV40dssKqz3su9UZbNZJlaf/YrjB5A+H3GjfCKAaPyh+W9n23DG4kDsWCusWKFaiS7Y6LmR7EGcLsPtN16D777BBhJe+a72m/5zaybwG4p8pzfrhNULoTyEnJZSIIBbtkojWQA9wuqiMrg/Qjbzpj01RDx1f0d71L391hwtQQTP4Kz27+62ZFWPznrbja5QFE1QOUkdr1ckuZZo5jIq5aEUuzeyWWgQMZmhic7P+rt76xgZUSvoDP/jUlYKZyjYvueQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KDVowZioijwXV4nOewRzGcUEFnKz8zYWuFnp2/tp1NvEgLTRVddf7492/z9l7VIF2NU1kY6m//qI/LCvgcPhreWjNiYlAecFAN38vMgzkZm4aVQDFvbUlzdb6kaRQmqEJyS3ZwyZatefa605maGaWTK00q00sB3IFvLn4Ntl84wv6B/wacd58u2ycPec5QMka2cCzbkGPTm+DDzBoS2qUI1IPotAQe6Q0suU6UH6/So/av5l18G332uwxDrtPqVYt7kPe+MsphgTebAyLppKSWK+pZ7m01z9mtPwRKV4X77WnoxFvleXVSPncNy+axBYIN4aqlGy+sZiVNjAPh5gCTKpFT+8OI8p5WZiFjc+6N4sx2SBDE8W9AtVgK/PfSpGuNrOPUglCxHQThbLQUXgtHqrExSWjin4eHa9hPyj/D07TV9BAR0FdG06lXB+0XYflRXRVJy1Pg0/zqxWJg8rkR1BW2AHzoAnUB9vQgBhtEfX6z37o152m3lq5YzsGaCZs4FVgKswXbfptPO2OkXVE2c6lRAOmJ1I0i0WysFkroAhhbQM5jsLb1qfRxDbS8cP+vjzKMCtxq+dMmB+d3mkzB+fNb7w4pSoBCgeTwq3TIxuc3TBaDYMI8km93G6G7+oeBjl9qDx2qCPcQCCsuhvN0sZn6GZjtXlg+om2TXZqwAjFM5stxAnW4/yYqdBmqsnhg3MUitDtRA6G/lzunB51WacI3xXg8FYcjwR4upJNsTtntO71y53uWKsU+kE5DT0IHBzh099gFjEOLipLT/gyEksb9AC19VhM8t5SVH77dQQazvOqIE5z41SeXjFN2FrJua5zudX7+F6SNr9IXBYA6leKOeZ0b167uS9wbQMew7n/RxztKkEpYMM6UXSALSjiYPj7uYXbp8GKDZN/HHqliHDAIuKfQ5tp4EhJYz3I8uNRUQUhtPyfQN9k/bq25/TJThu2lwZNtPEy0KOz6todg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a6fe688-08d5-4cbe-d099-08d9b85593ea X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2021 01:13:14.4724 (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: AM6PR03MB3686 Subject: [FFmpeg-devel] [PATCH 09/10] avformat/md5proto: Simplify data->hex conversion 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: /vwAGEMcPdD0 Signed-off-by: Andreas Rheinhardt --- libavformat/md5proto.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/md5proto.c b/libavformat/md5proto.c index 0e04b90aac..14cefe719c 100644 --- a/libavformat/md5proto.c +++ b/libavformat/md5proto.c @@ -25,6 +25,7 @@ #include "libavutil/error.h" #include "avformat.h" #include "avio.h" +#include "internal.h" #include "url.h" struct MD5Context { @@ -57,14 +58,13 @@ static int md5_close(URLContext *h) { struct MD5Context *c = h->priv_data; const char *filename = h->filename; - uint8_t md5[16], buf[64]; + uint8_t md5[16], buf[2 * sizeof(md5) + 1]; URLContext *out; - int i, err = 0; + int err = 0; av_md5_final(c->md5, md5); - for (i = 0; i < sizeof(md5); i++) - snprintf(buf + i*2, 3, "%02x", md5[i]); - buf[i*2] = '\n'; + ff_data_to_hex(buf, md5, sizeof(md5), 1); + buf[2 * sizeof(md5)] = '\n'; av_strstart(filename, "md5:", &filename); @@ -74,10 +74,10 @@ static int md5_close(URLContext *h) h->protocol_whitelist, h->protocol_blacklist, h); if (err) return err; - err = ffurl_write(out, buf, i*2+1); + err = ffurl_write(out, buf, sizeof(buf)); ffurl_close(out); } else { - if (fwrite(buf, 1, i*2+1, stdout) < i*2+1) + if (fwrite(buf, 1, sizeof(buf), stdout) < sizeof(buf)) err = AVERROR(errno); }