From patchwork Thu May 16 11:59:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Sayers X-Patchwork-Id: 48922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp2180445pzb; Thu, 16 May 2024 05:00:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2Umq5Hej+JrztNRGDIrS4vRRm7NeVAb0zjOj0fwuRyyYVheKhNXL9mpfgTctLjrUEv1zLF78igB9WjZP8xOo5ZVpyRLtnFNfvOA== X-Google-Smtp-Source: AGHT+IH+pETxfKKIIGg5211XRCuo0CLRMMAeUVih7wkg9UmjY/suystn0MKfWSU/m3BpdWDzGGUp X-Received: by 2002:a17:907:a4e:b0:a59:da00:5acf with SMTP id a640c23a62f3a-a5a2d53f590mr1548766066b.2.1715860853148; Thu, 16 May 2024 05:00:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715860853; cv=none; d=google.com; s=arc-20160816; b=EU/Kq16AnCjWyg++pKPqefnloldbORBCzCYggVDOfgPWDoPD7IWGm/9ULaKSYZSUuT Ly5WDCYN5vBNGEyhxiZolrSRVXB4ZNeo7NigZViGJ7CLG9AMieFvhd022FkOcbJOVnKH Q5TuH3jaR0WOhRx/iR2jtTYhmCydPeQB3xtHbCICBfS83+6FTaACaYywQ1CqhRJ21bOO vHL/sfvhHLZ++QUQbZUKeUvoFSqtr+35603zoSSI4TCzOtzh0TuSWbZzzOM3622QDg4i hYZoj6Kau9fNCMLQpFKWsN+IQW+93inUwh56sTTtD2ArwTxGkiGEQ16lpSWUeLw1dvOf vkGA== 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=d7n3UghsafvtZtthc4QgQJCjFU4xFO3pK1sLfaeNJu4=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=gN4GcGqIEzgFzvfhaZl6mbz9tC4INEfBbim36WlW4DW+w/eeDwAwJeXDR/Npq6mG1R QCEkBHE86iIUn6lhd4rdbnyf5Y24sHIl1R2zvmrlSsxflNCu819xGb4TYlhB5n+flHuw GG6wx0//JgKeRi+b8tJR7KYxJs0+mTueN1HuF9Sgipx1rnYVzBosBYiiR+60tohKqsGd Ow1YTz7cffdUM5d5EIZK0tPGJuVav2M0ahJW9/yGDrn39ISrlSkQXpCpPGFarMkrzqNN 3T/s4e/o8nRJaUDpWubUWjVHTV1xaYo4XhgrmUq0O4pbBZPS6G8zjIiIQ7AALem4lKQ+ gwcg==; 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 a640c23a62f3a-a5a17be8be0si865670966b.858.2024.05.16.05.00.52; Thu, 16 May 2024 05:00:53 -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 1092C68D53A; Thu, 16 May 2024 15:00:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from b-painless.mh.aa.net.uk (b-painless.mh.aa.net.uk [81.187.30.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A058868D39C for ; Thu, 16 May 2024 15:00:05 +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-b.tch.aa.net.uk with esmtp (Exim 4.96) (envelope-from ) id 1s7ZmG-002ewq-2h; Thu, 16 May 2024 13:00:05 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 May 2024 12:59:08 +0100 Message-ID: <20240516115959.3786610-4-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240516115959.3786610-1-ffmpeg-devel@pileofstuff.org> References: <91C9E49E-1EE3-4B37-AEF7-1A0D78481633@remlab.net> <20240516115959.3786610-1-ffmpeg-devel@pileofstuff.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 3/6] avformat/network: add ff_neterror2() for cases that don't use WSAGetLastError 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: aopMjlS3s9NQ For example, WSAStartup()'s documentation says: "A call to the WSAGetLastError function is not needed and should not be used" --- libavformat/network.c | 5 ++++- libavformat/network.h | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/network.c b/libavformat/network.c index 5d0d05c5f1..351dc34bb6 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -123,7 +123,10 @@ void ff_network_close(void) #if HAVE_WINSOCK2_H int ff_neterror(void) { - int err = WSAGetLastError(); + return ff_neterror2(WSAGetLastError()); +} +int ff_neterror2(int err) +{ switch (err) { case WSAEWOULDBLOCK: return AVERROR(EAGAIN); diff --git a/libavformat/network.h b/libavformat/network.h index f338694212..1ac067f09f 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -63,6 +63,12 @@ * @note Error is based on WSAGetLastError() (Windows) or `errno` (otherwise) */ int ff_neterror(void); +/* + * @brief ff_neterror()-style AVERROR + * @param err error code (usually an errno or Windows Sockets Error Code) + * @note Windows Sockets Error Codes are only supported in Windows + */ +int ff_neterror2(int err); #else #include #include