From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 7 Dec 2011 19:17:20 +0000 (+0100)
Subject: Standardize data field name in FileMap.
X-Git-Tag: BumpSslServerFirst.take05~12^2~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e12f6fa3ce6e62f88e4757e3bab2486acdf5b299;p=thirdparty%2Fsquid.git

Standardize data field name in FileMap.
---

diff --git a/src/FileMap.h b/src/FileMap.h
index 091952d3b0..3167534cff 100644
--- a/src/FileMap.h
+++ b/src/FileMap.h
@@ -83,7 +83,7 @@ public:
     int capacity() const {return capacity_;}
 
     /// return the number of used slots in the FileMap
-    int numFilesInMap() const {return used_slots_;}
+    int numFilesInMap() const {return usedSlots_;}
 private:
     /// grow the FileMap (size is doubled each time, up to 2^24 bits)
     void grow();
@@ -93,7 +93,7 @@ private:
     /// max number of files which can be tracked in the current store
     sfileno capacity_;
     /// used slots in the map
-    unsigned int used_slots_;
+    unsigned int usedSlots_;
     /// number of "long ints" making up the filemap
     unsigned int nwords;
     unsigned long *bitmap;
diff --git a/src/filemap.cc b/src/filemap.cc
index 230985df36..ead311b6ff 100644
--- a/src/filemap.cc
+++ b/src/filemap.cc
@@ -55,7 +55,7 @@
 #define FM_INITIAL_NUMBER (1<<14)
 
 FileMap::FileMap() :
-    capacity_(FM_INITIAL_NUMBER), used_slots_(0),
+    capacity_(FM_INITIAL_NUMBER), usedSlots_(0),
     nwords(capacity_ >> LONG_BIT_SHIFT)
 {
     debugs(8, 3, HERE << "creating space for " << capacity_ << " files");
@@ -90,7 +90,7 @@ FileMap::setBit(sfileno file_number)
 
     bitmap[file_number >> LONG_BIT_SHIFT] |= bitmask;
 
-    used_slots_++;
+    usedSlots_++;
 
     return file_number;
 }
@@ -107,7 +107,7 @@ FileMap::clearBit(sfileno file_number)
 {
     unsigned long bitmask = (1L << (file_number & LONG_BIT_MASK));
     bitmap[file_number >> LONG_BIT_SHIFT] &= ~bitmask;
-    used_slots_--;
+    usedSlots_--;
 }
 
 bool