diff mbox series

[FFmpeg-devel,v5,3/6] avformat/network: add ff_neterror2() for cases that don't use WSAGetLastError

Message ID 20240516115959.3786610-4-ffmpeg-devel@pileofstuff.org
State New
Headers show
Series avformat/network: improve ff_neterrno() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andrew Sayers May 16, 2024, 11:59 a.m. UTC 
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 mbox series

Patch

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 <sys/types.h>
 #include <sys/socket.h>