Author: hno

Don't be so verbose about not yet implemented store meta data types

diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc
index df5b9fa4eea140bae570dca0613c949d4d5b966c..d298d41659bcd566e0e6c5743e662c2ff36b873c 100644 (file)
--- a/src/StoreMeta.cc
+++ b/src/StoreMeta.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: StoreMeta.cc,v 1.6 2007/09/19 08:54:51 hno Exp $
+ * $Id: StoreMeta.cc,v 1.6.2.1 2008/02/24 11:29:04 amosjeffries Exp $
  *
  * DEBUG: section 20    Storage Manager Swapfile Metadata
  * AUTHOR: Kostas Anagnostakis
@@ -48,12 +48,17 @@ bool
 StoreMeta::validType(char type)
 {
     /* VOID is reserved, and new types have to be added as classes */
-
-    if (type <= STORE_META_VOID || type >= STORE_META_END) {
+    if (type <= STORE_META_VOID || type >= STORE_META_END + 10) {
         debugs(20, 0, "storeSwapMetaUnpack: bad type (" << type << ")!");
         return false;
     }
 
+    /* Not yet implemented */
+    if (type >= STORE_META_END) {
+        debugs(20, 3, "storeSwapMetaUnpack: Not yet implemented (" << type << ") in disk metadata");
+        return false;
+    }
+
     /* Unused in any current squid code */
     if (type == STORE_META_KEY_URL ||
             type == STORE_META_KEY_SHA ||

diff --git a/src/enums.h b/src/enums.h
index cfa5078e73c43511e28e0aedf1890f8a79fd43f4..3a6389960bc33f68096a2c37bb6f6d68d934bc20 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.258 2007/08/13 17:20:51 hno Exp $
+ * $Id: enums.h,v 1.258.2.1 2008/02/24 11:29:04 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -442,6 +442,7 @@ enum {
     STORE_META_VARY_HEADERS,   /* Stores Vary request headers */
     STORE_META_STD_LFS,         /* standard metadata in lfs format */
     STORE_META_OBJSIZE,         /* object size, not impleemented, squid26 compatibility */
+    /* STORE_META_VARY_ID,     / * Unique ID linking variants */
     STORE_META_END
 };