SourceFormat: enforcement

[thirdparty/squid.git] / src / Store.h

diff --git a/src/Store.h b/src/Store.h
index fde6afcb3385c02687195cc575b272b40dabb711..854b4fd896bad3e9da0526a80e44669376732270 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -60,8 +60,6 @@ class MemObject;
 class Store;
 class StoreSearch;
 
-typedef unsigned int ping_status_t;
-
 /**
  \ingroup StoreAPI
  */
@@ -141,24 +139,19 @@ public:
     u_short flags;
     /* END OF ON-DISK STORE_META_STD */
 
-sfileno swap_filen:
-    25;
+    sfileno swap_filen:25;
+
+    sdirno swap_dirn:7;
 
-sdirno swap_dirn:
-    7;
     u_short lock_count;                /* Assume < 65536! */
 
-mem_status_t mem_status:
-    3;
+    mem_status_t mem_status:3;
 
-ping_status_t ping_status:
-    3;
+    ping_status_t ping_status:3;
 
-store_status_t store_status:
-    3;
+    store_status_t store_status:3;
 
-swap_status_t swap_status:
-    3;
+    swap_status_t swap_status:3;
 
 public:
     static size_t inUseCount();
@@ -214,7 +207,7 @@ public:
 
     bool isEmpty () const {return true;}
 
-    virtual size_t bytesWanted(Range<size_t> const aRange) const { assert (aRange.size());return aRange.end - 1;}
+    virtual size_t bytesWanted(Range<size_t> const aRange) const { assert (aRange.size()); return aRange.end - 1;}
 
     void operator delete(void *address);
     void complete() {}
@@ -384,6 +377,9 @@ extern FREE destroyStoreEntry;
  */
 SQUIDCEXTERN void packerToStoreInit(Packer * p, StoreEntry * e);
 
+/// \ingroup StoreAPI
+SQUIDCEXTERN void storeGetMemSpace(int size);
+
 #ifdef _USE_INLINE_
 #include "Store.cci"
 #endif