From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Thu, 27 Oct 2011 05:24:19 +0000 (-0600)
Subject: Simplified code. No functionality changes expected.
X-Git-Tag: BumpSslServerFirst.take01~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a129ef4e21ef74fa397406c05af2effe440502;p=thirdparty%2Fsquid.git

Simplified code. No functionality changes expected.

!InDaemonMode() already implies both !UsingSmp() and IamWorkerProcess()
so !InDaemonMode() can be removed from the condition.
---

diff --git a/src/ipc/mem/Segment.cc b/src/ipc/mem/Segment.cc
index ca9f28c133..832261338c 100644
--- a/src/ipc/mem/Segment.cc
+++ b/src/ipc/mem/Segment.cc
@@ -221,7 +221,7 @@ Ipc::Mem::Segment::~Segment()
 bool
 Ipc::Mem::Segment::Enabled()
 {
-    return !InDaemonMode() || (!UsingSmp() && IamWorkerProcess());
+    return !UsingSmp() && IamWorkerProcess();
 }
 
 void