From patchwork Sat Apr 20 13:24: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: 48190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp1246188pzb; Sat, 20 Apr 2024 06:25:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKcuFpVzW9F7SwYmc6hjtenIcNKjN0Kdt566hROVwomY9EcBTvrI5JU4POVUDNyiE3s3DZ39grZDdGrjVIpkccnkRI2JcXR39CoQ== X-Google-Smtp-Source: AGHT+IHtiI6C/QYPEvoEJjVjHfrd5/Dgad0vju6OGwNGJBd7akeMZEDIlX4KqtG4WRzLddrQ2+V8 X-Received: by 2002:a17:906:c04e:b0:a52:42e4:96e5 with SMTP id bm14-20020a170906c04e00b00a5242e496e5mr3273923ejb.6.1713619526107; Sat, 20 Apr 2024 06:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713619526; cv=none; d=google.com; s=arc-20160816; b=SCZ0pMvJmqc8fb1aWuhd53dd8xPNUDzBxvDmhYhndVj7GveJJlQ5xFlQHTEDmgG8yw k740u2LAMZi+4A7I73mf3rEXco/SpL+UGV46dNwlz8Gwavli1ieTysjm1biqm2OS4QZX 9P2Ykm3WQLFZQQL7t6Kq7BG8wQkVt3sax2f5qlmYwRlQbXFYzRugdo9Ylw1/1IaX1/be v4t2eTHv3E3eKWnIpB1qkmJnNXz/VUBYTO0EjiMn7hv+BociqS2LNVDBfqSVEIVywk/1 tNhJ1LgEUqLZo3VwiUFKHW5Mf7ak09GAsxC+pFaGd/46z2q1bdsmw3TLfix65ahWoay1 7sKw== 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=oNALM3lXxsc2wmzyVd0mCkuwwNr1vs2yalXLzcLre3g=; fh=73ExZnkQ8FYbu/qeQNmI0dtHCfShNh8/NmZJs1umltM=; b=yh5zL/T+Day1Jdhcb0My4tbBhHPDlYPf79/pbRw/I/23k0lZXJ0n7OX0oN1GhZZCNQ WYKIEG1Si0+8vF4K95qVwuy+aIbYYU07pqjY2dfhPZXrtQ3daklDGpxb2MPqMo11x7ut fBnOBZ0saa86N8oV3AYmXgv9BGyRcFu3raGCrfxAWvBPUvV+lArtWplF3EQ/l6Hv6p1U bA0bxRL8pJ/DpUuAyY8G6d2fG8AZyVU41K44/xsJrlQWKRjnWeyVjDmlXKXBVZ2IwoUg bbhXU/YTCbfcuLqMHcTIAWN7D9pnnT2mG8QC8yfVdnWOXH2S2jR1uedR/iNOT2z+CWMn dyzg==; 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 z21-20020a170906241500b00a555ba222c2si3418695eja.966.2024.04.20.06.25.25; Sat, 20 Apr 2024 06:25:26 -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 956DB68D216; Sat, 20 Apr 2024 16:25:22 +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 78D7868C558 for ; Sat, 20 Apr 2024 16:25:16 +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 1ryAiR-006woG-38; Sat, 20 Apr 2024 14:25:15 +0100 From: Andrew Sayers To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2024 14:24:59 +0100 Message-ID: <20240420132501.273495-1-ffmpeg-devel@pileofstuff.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [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 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: dcQBNrJ9uaph 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 #include @@ -66,6 +67,7 @@ int ff_neterrno(void); #include #define ff_neterrno() AVERROR(errno) +#define ff_neterrno2(ERRNO) AVERROR(ERRNO) #endif /* HAVE_WINSOCK2_H */ #if HAVE_ARPA_INET_H