From patchwork Wed May 4 15:36:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp509964pzb; Wed, 4 May 2022 08:38:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOt+JiD07Ga6hUZzclOaupDt3vuQz1zJrMbDU6XB2KO+9hOMOC7R4tDdeZWnieFW3zfnvu X-Received: by 2002:aa7:cc02:0:b0:411:487e:36fe with SMTP id q2-20020aa7cc02000000b00411487e36femr23668811edt.338.1651678685394; Wed, 04 May 2022 08:38:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651678685; cv=none; d=google.com; s=arc-20160816; b=AknROeYgHw+cNYkNH7lZQQNvQBPvkg246Pv+kESvNtScDMyM7On26VJ2A8/LkF04O2 H8qVXaqljfNr+e44OXqBwyJHIG+SEb+Y8Kn/6V+DPcJLWDSkXoaL+Gp7PpChK6ZvM03Q 2WL906/m1gLkslIeDwCSgO3OE2NNKjxfO9Zp2hso8Nhh1X1LGaYVKgTu42zriuLdMKb6 6OWK7Fv/b5wPSToOldhrQ3Z/hbzEgU3wQaZ8KONcjNw3P8VpTCPKFIXxoQKgoB+bB8NW JpzMTPGuYjGDW7SN0jqf8xIY04AxoXSPC0O2Qt8Z+bJic0bH0D6IUXsq+Y8kPmMMsWiL yBtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=bokGTe9w2JoR1N0ZPBT2GB6ShN10Z6sUufWV42AAA34=; b=r56xlkyFJhJyDYuAdrQD3O9ni81xUvaJmlb0JnFgmlGaLILrgdZQPBGwvxnr5XavpN hqbDcL0dBi4zY+TL8ho4azbJDYHlqkEH12g4Lhma8tJkEI526iG7l5Cd6DaQFi5KkP59 tXXE9eWM6vLK6YaRjU9omItubV2A7M+tZDqQtOltQyBHMeR9COvoYsDHIJfWk1omo4dO 5LZo9sUyCkWCUx/XMaIRqi/HOM/gfHnDeCwXeaHBXG7WCOBa/dPUnqdTuV6uJRCXykc4 XpW47ZmWvLXD+yvDK7aTkQx3iTjytKqlwg5WIXZHxqkAMsO+YIVb2ZtqekHwg5hX/zic HaZQ== 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 wi20-20020a170906fd5400b006df76385cf7si15086002ejb.407.2022.05.04.08.38.05; Wed, 04 May 2022 08:38:05 -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 F237468B270; Wed, 4 May 2022 18:38:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68DE66883BA for ; Wed, 4 May 2022 18:37:56 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nmH4Y-0007ws-08 for ffmpeg-devel@ffmpeg.org; Wed, 04 May 2022 17:37:50 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mGlanDv64SgGFmH3anPSGn; Wed, 04 May 2022 17:36:50 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id mH3LnBRd1OPqFmH3Ln2GnS; Wed, 04 May 2022 17:36:35 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62729d92 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=8Hh124TuUysk6HclMeYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 4 May 2022 17:36:33 +0200 Message-Id: <20220504153634.31364-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220504153634.31364-1-michael@niedermayer.cc> References: <20220504153634.31364-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfHUL2RLQyqyV5lgoutFJKEUppkNGDrUJUccu80x+V99D7pcxL5Z+BrwVfgHDtT67B8/dlQekEiF1RXfuw70JRhT29ERwaTCzXid4au9UjIMn+78Z2M68 ORZVy5+GDilStIbbz/9PKJG5IPT8E2m+XQrGtNKjRzh50dgpGtv7udF9aQO/OlJtWpKDvQDBwO2a5w== Subject: [FFmpeg-devel] [PATCH 2/3] avformat/libzmq: Improve r redundancy in occured 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DC39kVxpMmca --- libavformat/libzmq.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/libzmq.c b/libavformat/libzmq.c index 1b0d8638db..04c72ac601 100644 --- a/libavformat/libzmq.c +++ b/libavformat/libzmq.c @@ -51,7 +51,7 @@ static int zmq_proto_wait(URLContext *h, void *socket, int write) zmq_pollitem_t items = { .socket = socket, .fd = 0, .events = ev, .revents = 0 }; ret = zmq_poll(&items, 1, POLLING_TIME); if (ret == -1) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_poll(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_poll(): %s\n", ZMQ_STRERROR); return AVERROR_EXTERNAL; } return items.revents & ev ? 0 : AVERROR(EAGAIN); @@ -90,7 +90,7 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags) s->context = zmq_ctx_new(); if (!s->context) { /*errno not set on failure during zmq_ctx_new()*/ - av_log(h, AV_LOG_ERROR, "Error occured during zmq_ctx_new()\n"); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_ctx_new()\n"); return AVERROR_EXTERNAL; } @@ -100,13 +100,13 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags) if (h->flags & AVIO_FLAG_WRITE) { s->socket = zmq_socket(s->context, ZMQ_PUB); if (!s->socket) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_socket(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_socket(): %s\n", ZMQ_STRERROR); goto fail_term; } ret = zmq_bind(s->socket, uri); if (ret == -1) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_bind(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_bind(): %s\n", ZMQ_STRERROR); goto fail_close; } } @@ -115,19 +115,19 @@ static int zmq_proto_open(URLContext *h, const char *uri, int flags) if (h->flags & AVIO_FLAG_READ) { s->socket = zmq_socket(s->context, ZMQ_SUB); if (!s->socket) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_socket(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_socket(): %s\n", ZMQ_STRERROR); goto fail_term; } ret = zmq_setsockopt(s->socket, ZMQ_SUBSCRIBE, "", 0); if (ret == -1) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_setsockopt(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_setsockopt(): %s\n", ZMQ_STRERROR); goto fail_close; } ret = zmq_connect(s->socket, uri); if (ret == -1) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_connect(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_connect(): %s\n", ZMQ_STRERROR); goto fail_close; } } @@ -150,7 +150,7 @@ static int zmq_proto_write(URLContext *h, const unsigned char *buf, int size) return ret; ret = zmq_send(s->socket, buf, size, 0); if (ret == -1) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_send(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_send(): %s\n", ZMQ_STRERROR); return AVERROR_EXTERNAL; } return ret; /*number of bytes sent*/ @@ -166,7 +166,7 @@ static int zmq_proto_read(URLContext *h, unsigned char *buf, int size) return ret; ret = zmq_recv(s->socket, buf, size, 0); if (ret == -1) { - av_log(h, AV_LOG_ERROR, "Error occured during zmq_recv(): %s\n", ZMQ_STRERROR); + av_log(h, AV_LOG_ERROR, "Error occurred during zmq_recv(): %s\n", ZMQ_STRERROR); return AVERROR_EXTERNAL; } if (ret > size) {