SourceFormat Enforcement

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

diff --git a/src/helper.h b/src/helper.h
index 7e1f235813d82c7f35e80f1f1f55dd995584be19..cc865e93d883496846b67589ac5258e10034128f 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -37,9 +37,9 @@
 #include "cbdata.h"
 #include "comm/forward.h"
 #include "dlink.h"
-#include "ip/Address.h"
 #include "HelperChildConfig.h"
 #include "HelperReply.h"
+#include "ip/Address.h"
 
 class helper_request;
 
@@ -48,7 +48,15 @@ typedef void HLPCB(void *, const HelperReply &reply);
 class helper
 {
 public:
-    inline helper(const char *name) : cmdline(NULL), id_name(name), eom('\n'), url_quoting(false) {}
+    inline helper(const char *name) :
+            cmdline(NULL),
+            id_name(name),
+            ipc_type(0),
+            last_queue_warn(0),
+            last_restart(0),
+            eom('\n') {
+        memset(&stats, 0, sizeof(stats));
+    }
     ~helper();
 
 public:
@@ -62,7 +70,6 @@ public:
     time_t last_queue_warn;
     time_t last_restart;
     char eom;   ///< The char which marks the end of (response) message, normally '\n'
-    bool url_quoting;
 
     struct _stats {
         int requests;
@@ -78,7 +85,7 @@ private:
 class statefulhelper : public helper
 {
 public:
-    inline statefulhelper(const char *name) : helper(name) {};
+    inline statefulhelper(const char *name) : helper(name), datapool(NULL), IsAvailable(NULL), OnEmptyQueue(NULL) {};
     inline ~statefulhelper() {};
 
 public:
@@ -125,11 +132,11 @@ public:
     dlink_node link;
 
     struct _helper_flags {
-        unsigned int busy:1;
-        unsigned int writing:1;
-        unsigned int closing:1;
-        unsigned int shutdown:1;
-        unsigned int reserved:1;
+        bool busy;
+        bool writing;
+        bool closing;
+        bool shutdown;
+        bool reserved;
     } flags;
 
     struct {