From: wessels <>
Date: Tue, 26 May 1998 21:48:26 +0000 (+0000)
Subject: don't need HIERARCHICAL StoreEntry->flag any more.
X-Git-Tag: SQUID_3_0_PRE1~3258
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f60c7a0204cb0183338010c5c3bcfd73e1ecbfd;p=thirdparty%2Fsquid.git

don't need HIERARCHICAL StoreEntry->flag any more.
---

diff --git a/src/enums.h b/src/enums.h
index a28b30256f..511c1bdfff 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -427,7 +427,6 @@ enum {
     ENTRY_CACHABLE,
     ENTRY_DISPATCHED,
     KEY_PRIVATE,
-    HIERARCHICAL,
     ENTRY_NEGCACHED,
     ENTRY_VALIDATED,
     ENTRY_BAD_LENGTH
diff --git a/src/peer_select.cc b/src/peer_select.cc
index 3a9231bd2c..4e097b5f94 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.61 1998/05/21 22:39:00 wessels Exp $
+ * $Id: peer_select.cc,v 1.62 1998/05/26 15:48:27 wessels Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -96,7 +96,7 @@ peerSelectIcpPing(request_t * request, int direct, StoreEntry * entry)
     if (entry->ping_status != PING_NONE)
 	return 0;
     assert(direct != DIRECT_YES);
-    if (!EBIT_TEST(entry->flag, HIERARCHICAL) && direct != DIRECT_NO)
+    if (!EBIT_TEST(request->flags, REQ_HIERARCHICAL) && direct != DIRECT_NO)
 	return 0;
     if (EBIT_TEST(entry->flag, KEY_PRIVATE) && !neighbors_do_private_keys)
 	if (direct != DIRECT_NO)
diff --git a/src/store.cc b/src/store.cc
index 8230418da2..9dcce759ad 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.417 1998/05/22 23:44:29 wessels Exp $
+ * $Id: store.cc,v 1.418 1998/05/26 15:48:28 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -425,10 +425,6 @@ storeCreateEntry(const char *url, const char *log_url, int flags, method_t metho
 	EBIT_CLR(e->flag, ENTRY_CACHABLE);
 	storeReleaseRequest(e);
     }
-    if (EBIT_TEST(flags, REQ_HIERARCHICAL))
-	EBIT_SET(e->flag, HIERARCHICAL);
-    else
-	EBIT_CLR(e->flag, HIERARCHICAL);
     e->store_status = STORE_PENDING;
     storeSetMemStatus(e, NOT_IN_MEMORY);
     e->swap_status = SWAPOUT_NONE;