From patchwork Fri Apr 19 19:08:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 48179 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp837063pzb; Fri, 19 Apr 2024 12:08:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUZvFbSTdTAn0hZDVFdJPVIj6MuBOgnZsOu/4tTBV3MdqXpniDzVcafXv0trnZYBK1+i6sP9n0XLCvsmFeFNx6ZSbTUO/HHWt6qfQ== X-Google-Smtp-Source: AGHT+IEPcipATDQsPrgkM6qCfJDnr4cFVlR1IZr3+NnH1HRJXtntEJioSxfx9q6VKWhyPH5FUTj6 X-Received: by 2002:a17:906:2591:b0:a52:6cb2:9347 with SMTP id m17-20020a170906259100b00a526cb29347mr1856414ejb.8.1713553703028; Fri, 19 Apr 2024 12:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713553703; cv=none; d=google.com; s=arc-20160816; b=yo8cHnmyhPWM/w/uwCSYRNUtcg4j4k+jvh7SiMNNXoQjQCGFXClnZCaOtwEVbuj1Ye KCj0rKvqCqYp/Auzx8Pzyrr5tbr/yStkMMCi9XMxF+c5zkuTLOaqu/ZE1ssVBPX/42ND sqDYkfSHoDu9sA0IJaNLoChcnlBpZMqTBTrwOqLTan63THnLAJjXPMMScBVf+ChszHhE rpdzEd6Dl2+rvITinb9q3gia+SP9zQ8AoB8Y0klNwXm66pl7o9hQP8Bau7tCbWjf8lTJ 8aa/1MllaLsGrO65LNHBGRMhj9mzVX+87wtK2tAV2szDy5yMiro6lI874cebr0SLdQJj +3pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=TEQ4xUCAILB4HjG/tPuM744+QaOSmSCjUT8Yhq0l018=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=Ad2zGmCCjLnv1lRwyv16z87FJIcHbu99IKwgR865hMs5NCw/n9EzqL5uqenhjcBOlA QK2ZppuKriJB2wK+2v3DHpAbgjXk4INmfByDgYvR7RCcuAB1NVFRsYnIIEY2j60FBeoB 2GFWgBZUDuJ4JMRuIEb/DWpu1MOeBnwpim5jMrfBUhHEbswG7i9z14SG4fUhAy0qWXOf tUXqvIA6H9VTJFmhnZATGZ/od6XNkTBTUcwqQ0GWsDSqlD2yrTupP8VqjCpbU5dDxiia Ut5IWVfKflELvHrdA8ivyp5c/vtAYHjaILCf6MwPuYqYXk3K/xkVYLCMCWpU7G9XlwTh tQKg==; dara=google.com 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 u6-20020a170906b10600b00a52434e411dsi2432132ejy.525.2024.04.19.12.08.22; Fri, 19 Apr 2024 12:08:23 -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 C8E7268D430; Fri, 19 Apr 2024 22:08:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from alt2.a-painless.mh.aa.net.uk (alt2.a-painless.mh.aa.net.uk [81.187.30.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 346AC68D39F for ; Fri, 19 Apr 2024 22:08:04 +0300 (EEST) Received: from 0.b.4.b.7.4.0.8.c.4.a.5.d.8.b.2.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:819:850:2b8d:5a4c:8047:b4b0] helo=andrews-2024-laptop.lan) by painless-a.thn.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1rxtae-005Tu2-0J; Fri, 19 Apr 2024 20:08:03 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 20:08:00 +0100 Message-ID: <20240419190801.169291-2-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240419190801.169291-1-ffmpeg-devel@pileofstuff.org> References: <819f684d-8a72-465d-ab22-3eef5bc3468b@gmail.com> <20240419190801.169291-1-ffmpeg-devel@pileofstuff.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] avformat/network: Return 0/AVERROR from ff_network_init() 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: Andrew Sayers Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CIFPHwJ/e3ZI --- libavformat/avio.c | 4 ++-- libavformat/network.c | 7 +++---- libavformat/rtsp.c | 12 ++++++------ libavformat/rtspdec.c | 4 ++-- libavformat/sapdec.c | 4 ++-- libavformat/sapenc.c | 4 ++-- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index d109f3adff..f82edec779 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -123,8 +123,8 @@ static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, int err; #if CONFIG_NETWORK - if (up->flags & URL_PROTOCOL_FLAG_NETWORK && !ff_network_init()) - return AVERROR(EIO); + if (up->flags & URL_PROTOCOL_FLAG_NETWORK && (err=ff_network_init())<0) + return err; #endif if ((flags & AVIO_FLAG_READ) && !up->url_read) { av_log(NULL, AV_LOG_ERROR, diff --git a/libavformat/network.c b/libavformat/network.c index fb70f9cafc..134869a63f 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -59,11 +59,10 @@ int ff_network_init(void) { #if HAVE_WINSOCK2_H WSADATA wsaData; - - if (WSAStartup(MAKEWORD(1,1), &wsaData)) - return 0; + return ff_neterrno2(WSAStartup(MAKEWORD(1,1), &wsaData)); +#else + return 0; #endif - return 1; } int ff_network_wait_fd(int fd, int write) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b0c61ee00a..3db4ed11c2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1740,8 +1740,8 @@ int ff_rtsp_connect(AVFormatContext *s) return AVERROR(EINVAL); } - if (!ff_network_init()) - return AVERROR(EIO); + if ((err = ff_network_init())<0) + return err; if (s->max_delay < 0) /* Not set by the caller */ s->max_delay = s->iformat ? DEFAULT_REORDERING_DELAY : 0; @@ -2395,8 +2395,8 @@ static int sdp_read_header(AVFormatContext *s) char url[MAX_URL_SIZE]; AVBPrint bp; - if (!ff_network_init()) - return AVERROR(EIO); + if ((err = ff_network_init())<0) + return err; if (s->max_delay < 0) /* Not set by the caller */ s->max_delay = DEFAULT_REORDERING_DELAY; @@ -2522,8 +2522,8 @@ static int rtp_read_header(AVFormatContext *s) AVBPrint sdp; AVDictionary *opts = NULL; - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; opts = map_to_opts(rt); ret = ffurl_open_whitelist(&in, s->url, AVIO_FLAG_READ, diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 10078ce2fa..3b0829694e 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -663,8 +663,8 @@ static int rtsp_listen(AVFormatContext *s) int ret; enum RTSPMethod methodcode; - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; /* extract hostname and port */ av_url_split(proto, sizeof(proto), auth, sizeof(auth), host, sizeof(host), diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index 357c0dd514..719c26c6b8 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -70,8 +70,8 @@ static int sap_read_header(AVFormatContext *s) int port; int ret, i; - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, path, sizeof(path), s->url); diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 87a834a8d8..3305122524 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -80,8 +80,8 @@ static int sap_write_header(AVFormatContext *s) int udp_fd; AVDictionaryEntry* title = av_dict_get(s->metadata, "title", NULL, 0); - if (!ff_network_init()) - return AVERROR(EIO); + if ((ret = ff_network_init())<0) + return ret; /* extract hostname and port */ av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &base_port,