From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 16 Oct 2018 14:51:00 +0000 (+0200)
Subject: Revert "FreeBSD: Fix recv problem if no data received."
X-Git-Tag: v4.2.8~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2a8af143ed438e4a6302f3468fcae8b0268a723;p=thirdparty%2Ftvheadend.git

Revert "FreeBSD: Fix recv problem if no data received."

This reverts commit 3895c923a3a959da05080831b8146c09ed143b00.
---

diff --git a/src/tcp.c b/src/tcp.c
index 11641c970..c3a5d2385 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -414,11 +414,8 @@ tcp_socket_dead(int fd)
   if (err)
     return -err;
 #ifdef PLATFORM_FREEBSD
-  err = recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT);
-  if (err < 0)
+  if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) < 0)
     return -errno;
-  else if (err == 0)
-      return -EIO;
 #else
   if (recv(fd, NULL, 0, MSG_PEEK | MSG_DONTWAIT) == 0)
     return -EIO;