From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id DF77C4096E
	for <ffmpegdev@gitmailbox.com>; Sat, 27 Apr 2024 08:47:15 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4612E68D283;
	Sat, 27 Apr 2024 11:47:12 +0300 (EEST)
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 3BAE568B779
 for <ffmpeg-devel@ffmpeg.org>; Sat, 27 Apr 2024 11:47:05 +0300 (EEST)
Received: from
 c.f.b.5.7.6.c.f.0.9.0.a.0.b.9.f.0.5.8.0.9.1.8.0.0.b.8.0.1.0.0.2.ip6.arpa
 ([2001:8b0:819:850:f9b0:a090:fc67:5bfc] helo=andrews-2024-laptop.sayers)
 by painless-a.thn.aa.net.uk with smtp (Exim 4.96)
 (envelope-from <ffmpeg-devel@pileofstuff.org>) id 1s0di4-003EhY-24
 for ffmpeg-devel@ffmpeg.org; Sat, 27 Apr 2024 09:47:04 +0100
Date: Sat, 27 Apr 2024 09:46:55 +0100
From: Andrew Sayers <ffmpeg-devel@pileofstuff.org>
To: ffmpeg-devel@ffmpeg.org
Message-ID: <Ziy7f-brSyzwD_6k@andrews-2024-laptop.sayers>
References: <ZiN1Yy1+QId2ns3/@mariano>
 <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org>
Subject: Re: [FFmpeg-devel] [PATCH v4 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/Ziy7f-brSyzwD_6k@andrews-2024-laptop.sayers/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

On Sat, Apr 20, 2024 at 02:24:59PM +0100, Andrew Sayers wrote:
> 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 | 2 ++
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/libavformat/network.c b/libavformat/network.c
> index f752efc411..f295957aa5 100644
> --- a/libavformat/network.c
> +++ b/libavformat/network.c
> @@ -123,7 +123,10 @@ 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);
> diff --git a/libavformat/network.h b/libavformat/network.h
> index ca214087fc..84348f52a4 100644
> --- a/libavformat/network.h
> +++ b/libavformat/network.h
> @@ -58,6 +58,7 @@
>  #define setsockopt(a, b, c, d, e) setsockopt(a, b, c, (const char*) d, e)
>  
>  int ff_neterrno(void);
> +int ff_neterrno2(int err);
>  #else
>  #include <sys/types.h>
>  #include <sys/socket.h>
> @@ -66,6 +67,7 @@ int ff_neterrno(void);
>  #include <netdb.h>
>  
>  #define ff_neterrno() AVERROR(errno)
> +#define ff_neterrno2(ERRNO) AVERROR(ERRNO)
>  #endif /* HAVE_WINSOCK2_H */
>  
>  #if HAVE_ARPA_INET_H

Ping?  Still applies, and I'm not aware of any further changes needed.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".