From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sun, 20 Jan 2013 21:25:52 +0000 (+0100)
Subject: Completed StoreIOState constructor, changed some flags to bool type
X-Git-Tag: SQUID_3_4_0_1~366
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3555cbff6ce1ff2ed0c254ea817729add7fffa02;p=thirdparty%2Fsquid.git

Completed StoreIOState constructor, changed some flags to bool type
---

diff --git a/src/StoreIOState.cc b/src/StoreIOState.cc
index a56e803fee..ee159cc1db 100644
--- a/src/StoreIOState.cc
+++ b/src/StoreIOState.cc
@@ -46,9 +46,13 @@ StoreIOState::operator new (size_t amount)
 void
 StoreIOState::operator delete (void *address) {assert (0);}
 
-StoreIOState::StoreIOState()
+StoreIOState::StoreIOState() :
+        swap_dirn(-1), swap_filen(-1), e(NULL), mode(O_BINARY),
+        offset_(0), file_callback(NULL), callback(NULL), callback_data(NULL)
 {
-    mode = O_BINARY;
+    read.callback = NULL;
+    read.callback_data = NULL;
+    flags.closing = false;
 }
 
 off_t
diff --git a/src/StoreIOState.h b/src/StoreIOState.h
index 6f0f6d2676..d794798e64 100644
--- a/src/StoreIOState.h
+++ b/src/StoreIOState.h
@@ -105,7 +105,7 @@ public:
     } read;
 
     struct {
-        unsigned int closing:1;	/* debugging aid */
+        bool closing;	/* debugging aid */
     } flags;
 };
 
diff --git a/src/store_io.cc b/src/store_io.cc
index 403a050a56..e2f9d2a2c3 100644
--- a/src/store_io.cc
+++ b/src/store_io.cc
@@ -63,7 +63,7 @@ storeClose(StoreIOState::Pointer sio, int how)
         return;
     }
 
-    sio->flags.closing = 1;
+    sio->flags.closing = true;
 
     debugs(20,3,HERE << "storeClose: calling sio->close(" << how << ")");
     sio->close(how);