From: wessels <>
Date: Fri, 11 Sep 1998 01:56:28 +0000 (+0000)
Subject: don't close same FD twice if unlinkd_wfd == unlinkd_rfd.
X-Git-Tag: SQUID_3_0_PRE1~2746
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18e72ae1e9f49b1fc179274b36183070f93b57d0;p=thirdparty%2Fsquid.git

don't close same FD twice if unlinkd_wfd == unlinkd_rfd.
---

diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index 974c34a7b0..f3e257f565 100644
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: unlinkd.cc,v 1.26 1998/08/14 17:38:19 wessels Exp $
+ * $Id: unlinkd.cc,v 1.27 1998/09/10 19:56:28 wessels Exp $
  *
  * DEBUG: section 12    Unlink Daemon
  * AUTHOR: Duane Wessels
@@ -113,13 +113,11 @@ void
 unlinkdClose(void)
 {
 #if USE_UNLINKD
-    if (unlinkd_wfd < 0) {
-	debug_trap("unlinkdClose: unlinkd_wfd < 0");
-	return;
-    }
+    assert(unlinkd_wfd > -1);
     debug(12, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
     file_close(unlinkd_wfd);
-    file_close(unlinkd_rfd);
+    if (unlinkd_wfd != unlinkd_rfd)
+        file_close(unlinkd_rfd);
     unlinkd_wfd = -1;
     unlinkd_rfd = -1;
 #endif