SourceFormat Enforcement

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

diff --git a/src/mem_node.h b/src/mem_node.h
index 3ef21ab63f09f075f7a6b1f099b114c1a9eff380..2767d28c95f95ca97a34dd32bae6ddaa91f4de6a 100644 (file)
--- a/src/mem_node.h
+++ b/src/mem_node.h
@@ -1,70 +1,43 @@
-
 /*
- * $Id: mem_node.h,v 1.9 2005/09/14 18:23:21 wessels Exp $
- *
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
  *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_MEM_NODE_H
 #define SQUID_MEM_NODE_H
 
-#include "StoreIOBuffer.h"
+#include "defines.h"
+#include "mem/forward.h"
 #include "Range.h"
+#include "StoreIOBuffer.h"
 
 class mem_node
 {
+    MEMPROXY_CLASS(mem_node);
 
 public:
     static size_t InUseCount();
-    static unsigned long store_mem_size;       /* 0 */
+    static size_t StoreMemSize();
 
-    MEMPROXY_CLASS(mem_node);
-    mem_node(off_t);
+    mem_node(int64_t);
     ~mem_node();
     size_t space() const;
-    size_t start() const;
-    size_t end() const;
-    Range<size_t> dataRange() const;
-    bool contains (size_t const &location) const;
-    bool canAccept (size_t const &location) const;
+    int64_t start() const;
+    int64_t end() const;
+    Range<int64_t> dataRange() const;
+    bool contains (int64_t const &location) const;
+    bool canAccept (int64_t const &location) const;
     bool operator < (mem_node const & rhs) const;
     /* public */
     StoreIOBuffer nodeBuffer;
     /* Private */
     char data[SM_PAGE_SIZE];
-
-unsigned int write_pending:
-    1;
+    bool write_pending;
 };
 
-MEMPROXY_CLASS_INLINE(mem_node)
-
 inline std::ostream &
 operator << (std::ostream &os, mem_node &aNode)
 {
@@ -75,3 +48,4 @@ operator << (std::ostream &os, mem_node &aNode)
 void memNodeWriteComplete(void *);
 
 #endif /* SQUID_MEM_NODE_H */
+