From patchwork Fri Apr 19 19:07:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 48178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp836984pzb; Fri, 19 Apr 2024 12:08:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmWiGAbJhaYM6LVwFIPGNORnh0sibwtSFv6R2CTdUweG9M21cAUDD1us+mbg1J93gCWWk0nPvAhCGxGT0YuU4WuS45UzFoEmTfAw== X-Google-Smtp-Source: AGHT+IFgQilWh7GYDxsurfDRxSQh3pDGehTxjGn3PF8HmDuUcL/IE+WkKgjPohspO44BSkv5BKWv X-Received: by 2002:a17:906:a081:b0:a54:c11b:527c with SMTP id q1-20020a170906a08100b00a54c11b527cmr1875105ejy.4.1713553694413; Fri, 19 Apr 2024 12:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713553694; cv=none; d=google.com; s=arc-20160816; b=P83PjIJ7cRPAhGCqggRDENd+3pZkFNyfQQvi4SRI6CaVGlH/uj2/Ec+mtkD7p94q2k WcnPS943HbTBelLFLRo77mIyNdtYl8cMcCNqRtMNAnd1Xoo1rG8Tx/T32LerAjYY8CGW ckUIMjso5YqNjBg1ujk4duzXaxdDi79y4ke+WFSrn9em0wBrskOtVRw3tjpL6LHpMQWa Y3pltqaIynvTxoqfcRGUYYPxrY5eqHH0PAx2df8phNjQY+RY7dQPnyPAX5LVKOFPzkbH av5yxr5EoNnwZ1sfwPkBFhJRwUHmzDQtEOc6VYMbDk4MRUX3ABi8hWpxsrLM+HHFEEiY MQVg== 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=WOyiNaRaM2E1sHR7oyq8AMi/BQIHTS7q8CTVz+Z2HZ4=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=MPImvNfyfxkahpf8j95Y/Cag/m6tASClJJiRSFdbtPsI/4xNZTAaABsbOCGpYWZa4L 6QTK5Zn9FrU0Fbje+B+i67302+wa5z7wn5QjIBkZmBgITjJ5bQSOdulRrB22CGtXZWcu CfMjyLaWIlNv0XFP4fuHrd3fLhURPmtWAl74TBujp+tlPsRrl0KlrbMtz3FK5Khu7lgR sg3LkzDdkkowtLjXaeK4Z9y8o3iEEdn2YJ1Y6G1xUleGVizjQd0tl340MMnkle7YR0kl 2Tkdv+fP7BVmjmzoCX0u3ZZ6o9NFT1NHU3jwek/MearW+xcmk68tWTYKe7G1qRVauLFT Ljgw==; 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 kk9-20020a170907766900b00a52595a3a4asi2371163ejc.98.2024.04.19.12.08.13; Fri, 19 Apr 2024 12:08:14 -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 B811668D425; Fri, 19 Apr 2024 22:08:10 +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 36B1668D414 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 1rxtad-005Tu2-2a; Fri, 19 Apr 2024 20:08:03 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 20:07:59 +0100 Message-ID: <20240419190801.169291-1-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <819f684d-8a72-465d-ab22-3eef5bc3468b@gmail.com> References: <819f684d-8a72-465d-ab22-3eef5bc3468b@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/3] avformat/network: add ff_neterrno2() for cases where we already have an errno 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: bixWtPpojCap For example, WSAStartup()'s documentation says: "A call to the WSAGetLastError function is not needed and should not be used" --- libavformat/network.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/network.c b/libavformat/network.c index f752efc411..fb70f9cafc 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -121,9 +121,14 @@ void ff_network_close(void) } #if HAVE_WINSOCK2_H + +} int ff_neterrno(void) { - int err = WSAGetLastError(); + return ff_neterrno2(WSAGetLastError()); +} +int ff_neterrno2(int err) +{ switch (err) { case WSAEWOULDBLOCK: return AVERROR(EAGAIN);