From: wessels <>
Date: Tue, 25 Aug 1998 03:07:51 +0000 (+0000)
Subject: simplify #ifdefs
X-Git-Tag: SQUID_3_0_PRE1~2805
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dee517946c627253e561f2d808481c555abcf0c9;p=thirdparty%2Fsquid.git

simplify #ifdefs
---

diff --git a/src/store_client.cc b/src/store_client.cc
index e91210b2b2..c724a5bbea 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.39 1998/08/20 22:30:05 wessels Exp $
+ * $Id: store_client.cc,v 1.40 1998/08/24 21:07:51 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -275,23 +275,17 @@ storeClientFileRead(store_client * sc)
 {
     MemObject *mem = sc->entry->mem_obj;
     assert(sc->callback != NULL);
-#ifndef OPTIMISTIC_IO
-    if (mem->swap_hdr_sz == 0)
-#else
+#ifdef OPTIMISTIC_IO
     sc->flags.disk_io_pending = 1;
-    if (mem->swap_hdr_sz == 0) {
 #endif
+    if (mem->swap_hdr_sz == 0) {
 	file_read(sc->swapin_fd,
 	    sc->copy_buf,
 	    sc->copy_size,
 	    0,
 	    storeClientReadHeader,
 	    sc);
-#ifndef OPTIMISTIC_IO
-	else {
-#else
     } else {
-#endif
 	if (sc->entry->swap_status == SWAPOUT_WRITING)
 	    assert(mem->swapout.done_offset > sc->copy_offset + mem->swap_hdr_sz);
 	file_read(sc->swapin_fd,