From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 29 Oct 2012 22:46:06 +0000 (+1300)
Subject: Fix spelling and compile issues in CommIO
X-Git-Tag: SQUID_3_4_0_1~540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1564ff62127828f74435650e585f30994cad642d;p=thirdparty%2Fsquid.git

Fix spelling and compile issues in CommIO
---

diff --git a/src/DiskIO/DiskThreads/CommIO.cc b/src/DiskIO/DiskThreads/CommIO.cc
index 6112f2a8ad..87b43987bb 100644
--- a/src/DiskIO/DiskThreads/CommIO.cc
+++ b/src/DiskIO/DiskThreads/CommIO.cc
@@ -39,9 +39,9 @@
 #include "globals.h"
 
 void
-CommIO::Initialise()
+CommIO::Initialize()
 {
-    if (CommIO::Initialised)
+    if (CommIO::Initialized)
         return;
 
     /* Initialize done pipe signal */
@@ -54,7 +54,7 @@ CommIO::Initialise()
     commSetNonBlocking(DoneReadFD);
     commSetNonBlocking(DoneFD);
     Comm::SetSelect(DoneReadFD, COMM_SELECT_READ, NULLFDHandler, NULL, 0);
-    Initialised = true;
+    Initialized = true;
 }
 
 void
@@ -66,10 +66,10 @@ CommIO::NotifyIOClose()
     close(DoneReadFD);
     fd_close(DoneFD);
     fd_close(DoneReadFD);
-    Initialised = false;
+    Initialized = false;
 }
 
-bool CommIO::Initialised = false;
+bool CommIO::Initialized = false;
 bool CommIO::DoneSignalled = false;
 int CommIO::DoneFD = -1;
 int CommIO::DoneReadFD = -1;
diff --git a/src/DiskIO/DiskThreads/CommIO.h b/src/DiskIO/DiskThreads/CommIO.h
index 2d51f70897..91db33ec5c 100644
--- a/src/DiskIO/DiskThreads/CommIO.h
+++ b/src/DiskIO/DiskThreads/CommIO.h
@@ -10,13 +10,13 @@ class CommIO
 public:
     static inline void NotifyIOCompleted();
     static void ResetNotifications();
-    static void Initialise();
+    static void Initialize();
     static void NotifyIOClose();
 
 private:
     static void NULLFDHandler(int, void *);
     static void FlushPipe();
-    static bool Initialised;
+    static bool Initialized;
     static bool DoneSignalled;
     static int DoneFD;
     static int DoneReadFD;
@@ -26,7 +26,7 @@ private:
 void
 CommIO::NotifyIOCompleted()
 {
-    if (!Initialised) {
+    if (!Initialized) {
         fatalf("Disk Threads I/O pipes not initialized before first use.");
     }