Restore some reverted fixes for spelling, newlines and __linux__ macro.

llvm-svn: 215234

20 files changed, 37 insertions, 29 deletions

diff --git a/lldb/tools/lldb-mi/Driver.cpp b/lldb/tools/lldb-mi/Driver.cpp
index 28cb5f9771c..a59b4b74eb0 100644
--- a/lldb/tools/lldb-mi/Driver.cpp
+++ b/lldb/tools/lldb-mi/Driver.cpp
@@ -1296,3 +1296,4 @@ const CMIUtilString & Driver::GetDriverId( void ) const
 }
 
 #endif // MICONFIG_COMPILE_MIDRIVER_WITH_LLDBDRIVER
+
diff --git a/lldb/tools/lldb-mi/MICmdArgSet.cpp b/lldb/tools/lldb-mi/MICmdArgSet.cpp
index 845d67173f5..b0bee357cd6 100644
--- a/lldb/tools/lldb-mi/MICmdArgSet.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgSet.cpp
@@ -84,7 +84,7 @@ void CMICmdArgSet::Destroy( void )
 
 //++ ------------------------------------------------------------------------------------
 // Details:	Retrieve the state flag indicating that the command set up ready to parse
-//			command arguments or options found that one or more arguemnts was indeed
+//			command arguments or options found that one or more arguments was indeed
 //			present but not handled. This is given as a warning in the MI log file.
 // Type:	Method.
 // Args:	None.
@@ -97,7 +97,7 @@ bool CMICmdArgSet::IsArgsPresentButNotHandledByCmd( void ) const
 }
 	
 //++ ------------------------------------------------------------------------------------
-// Details:	Add the the list of command's arguments to parse and validate another one.
+// Details:	Add the list of command's arguments to parse and validate another one.
 // Type:	Method.
 // Args:	vArg	- (R) A command argument object.
 // Return:	MIstatus::success - Functional succeeded.
@@ -160,7 +160,7 @@ const CMICmdArgSet::SetCmdArgs_t &	CMICmdArgSet::GetArgsNotHandledByCmd( void )
 //++ ------------------------------------------------------------------------------------
 // Details:	Given a set of command argument objects parse the context option string to
 //			find those argument and retrieve their value. If the function fails call
-//			GetArgsThatAreMissing() to see which commands that were manadatory were 
+//			GetArgsThatAreMissing() to see which commands that were mandatory were 
 //			missing or failed to parse.
 // Type:	Method.
 // Args:	vStrMiCmd		- (R)  Command's name.
diff --git a/lldb/tools/lldb-mi/MICmdArgValFile.cpp b/lldb/tools/lldb-mi/MICmdArgValFile.cpp
index 31e644de588..d5cc52b90b4 100644
--- a/lldb/tools/lldb-mi/MICmdArgValFile.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValFile.cpp
@@ -50,7 +50,7 @@ CMICmdArgValFile::CMICmdArgValFile( const CMIUtilString & vrArgName, const bool
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValFile destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmdArgValListBase.cpp b/lldb/tools/lldb-mi/MICmdArgValListBase.cpp
index 4a0d0734d8e..99639205465 100644
--- a/lldb/tools/lldb-mi/MICmdArgValListBase.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValListBase.cpp
@@ -75,7 +75,7 @@ CMICmdArgValListBase::CMICmdArgValListBase( const CMIUtilString & vrArgName, con
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValListBase destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmdArgValListOfN.cpp b/lldb/tools/lldb-mi/MICmdArgValListOfN.cpp
index ee3df542f8b..2ba735e46c0 100644
--- a/lldb/tools/lldb-mi/MICmdArgValListOfN.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValListOfN.cpp
@@ -57,7 +57,7 @@ CMICmdArgValListOfN::CMICmdArgValListOfN( const CMIUtilString & vrArgName, const
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValListOfN destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmdArgValNumber.cpp b/lldb/tools/lldb-mi/MICmdArgValNumber.cpp
index 67affda878b..18bdccdc9ac 100644
--- a/lldb/tools/lldb-mi/MICmdArgValNumber.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValNumber.cpp
@@ -52,7 +52,7 @@ CMICmdArgValNumber::CMICmdArgValNumber( const CMIUtilString & vrArgName, const b
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValNumber destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmdArgValOptionLong.cpp b/lldb/tools/lldb-mi/MICmdArgValOptionLong.cpp
index 6fa6a590196..6c87984ba81 100644
--- a/lldb/tools/lldb-mi/MICmdArgValOptionLong.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValOptionLong.cpp
@@ -72,7 +72,7 @@ CMICmdArgValOptionLong::CMICmdArgValOptionLong( const CMIUtilString & vrArgName,
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValOptionLong destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
@@ -107,7 +107,7 @@ void CMICmdArgValOptionLong::Destroy( void )
 
 //++ ------------------------------------------------------------------------------------
 // Details:	Parse the command's argument options string and try to extract the long
-//			arguemnt *this argument type is looking for.
+//			argument *this argument type is looking for.
 // Type:	Overridden.
 // Args:	vwArgContext	- (RW) The command's argument options string.
 // Return:	MIstatus::success - Functional succeeded.
diff --git a/lldb/tools/lldb-mi/MICmdArgValOptionShort.cpp b/lldb/tools/lldb-mi/MICmdArgValOptionShort.cpp
index 77128b7ba6d..76adb7f1149 100644
--- a/lldb/tools/lldb-mi/MICmdArgValOptionShort.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValOptionShort.cpp
@@ -66,7 +66,7 @@ CMICmdArgValOptionShort::CMICmdArgValOptionShort( const CMIUtilString & vrArgNam
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValOptionShort destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmdArgValString.cpp b/lldb/tools/lldb-mi/MICmdArgValString.cpp
index 24881d011f7..b9ffecad1a8 100644
--- a/lldb/tools/lldb-mi/MICmdArgValString.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValString.cpp
@@ -74,7 +74,7 @@ CMICmdArgValString::CMICmdArgValString( const CMIUtilString & vrArgName, const b
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValString destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmdArgValThreadGrp.cpp b/lldb/tools/lldb-mi/MICmdArgValThreadGrp.cpp
index 0f6a867ddaa..7d329048211 100644
--- a/lldb/tools/lldb-mi/MICmdArgValThreadGrp.cpp
+++ b/lldb/tools/lldb-mi/MICmdArgValThreadGrp.cpp
@@ -52,7 +52,7 @@ CMICmdArgValThreadGrp::CMICmdArgValThreadGrp( const CMIUtilString & vrArgName, c
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmdArgValThreadGrp destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
@@ -169,4 +169,5 @@ bool CMICmdArgValThreadGrp::ExtractNumber( const CMIUtilString & vrTxt )
 MIuint CMICmdArgValThreadGrp::GetNumber( void ) const
 {
 	return m_nThreadGrp;
-}
\ No newline at end of file
+}
+
diff --git a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
index 4480f9b39dd..78ef76bf698 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
@@ -19,6 +19,8 @@
 // Copyright:	None.
 //--
 
+#include <stdlib.h>
+
 // Third Party Headers:
 #include <lldb/API/SBError.h>
 
diff --git a/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp b/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
index 8f2289d02c8..228a9cf4b3b 100644
--- a/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
+++ b/lldb/tools/lldb-mi/MICmnLogMediumFile.cpp
@@ -24,7 +24,7 @@
 #include "MICmnResources.h"
 #if defined( _MSC_VER )
 	#include "MIUtilSystemWindows.h"
-#elif defined( __FreeBSD__ ) || defined( __linux )
+#elif defined( __FreeBSD__ ) || defined( __linux__ )
 	#include "MIUtilSystemLinux.h"
 #elif defined( __APPLE__ )
 	#include "MIUtilSystemOsx.h"
diff --git a/lldb/tools/lldb-mi/MICmnResources.cpp b/lldb/tools/lldb-mi/MICmnResources.cpp
index aea6fbbe4ab..20c271ae8ed 100644
--- a/lldb/tools/lldb-mi/MICmnResources.cpp
+++ b/lldb/tools/lldb-mi/MICmnResources.cpp
@@ -258,7 +258,7 @@ CMICmnResources::CMICmnResources( void )
 
 //++ ------------------------------------------------------------------------------------
 // Details:	CMICmnResources destructor.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	None.
 // Return:	None.
 // Throws:	None.
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdin.cpp b/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
index d4f53dff014..ccd3544c40f 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
+++ b/lldb/tools/lldb-mi/MICmnStreamStdin.cpp
@@ -187,7 +187,7 @@ bool CMICmnStreamStdin::SetPrompt( const CMIUtilString & vNewPrompt )
 }
 
 //++ ------------------------------------------------------------------------------------
-// Details:	Retreive the command line prompt text currently being used.
+// Details:	Retrieve the command line prompt text currently being used.
 // Type:	Method.
 // Args:	None.
 // Return:	const CMIUtilString & - Functional failed.
@@ -201,7 +201,7 @@ const CMIUtilString & CMICmnStreamStdin::GetPrompt( void ) const
 //++ ------------------------------------------------------------------------------------
 // Details:	Wait on input from stream Stdin. On each line of input received it is 
 //			validated and providing there are no errors on the stream or the input
-//			buffer is not exceeded the data is passed to the vistor.
+//			buffer is not exceeded the data is passed to the visitor.
 // Type:	Method.
 // Args:	vrVisitor	- (W) A client deriver callback.
 // Return:	MIstatus::success - Functional succeeded.
@@ -216,7 +216,7 @@ bool CMICmnStreamStdin::SetVisitor( IStreamStdin & vrVisitor )
 
 //++ ------------------------------------------------------------------------------------
 // Details: Set whether to display optional command line prompt. The prompt is output to
-//			stdout. Disable it when this may interfer with the client reading stdout as
+//			stdout. Disable it when this may interfere with the client reading stdout as
 //			input and it tries to interpret the prompt text to.
 // Type:	Method.
 // Args:	vbYes	- (R) True = Yes prompt is shown/output to the user (stdout), false = no prompt.
@@ -231,7 +231,7 @@ void CMICmnStreamStdin::SetEnablePrompt( const bool vbYes )
 
 //++ ------------------------------------------------------------------------------------
 // Details: Get whether to display optional command line prompt. The prompt is output to
-//			stdout. Disable it when this may interfer with the client reading stdout as
+//			stdout. Disable it when this may interfere with the client reading stdout as
 //			input and it tries to interpret the prompt text to.
 // Type:	Method.
 // Args:	None. 
@@ -366,7 +366,7 @@ void CMICmnStreamStdin::SetCtrlCHit( void )
 
 //++ ------------------------------------------------------------------------------------
 // Details:	The main worker method for this thread.
-// Type:	Overidden.
+// Type:	Overridden.
 // Args:	vrbIsAlive	= (W) True = *this thread is working, false = thread has exited.			
 // Return:	MIstatus::success - Functional succeeded.
 //			MIstatus::failure - Functional failed.
diff --git a/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp b/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp
index 75703b71942..f73dc32d825 100644
--- a/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp
+++ b/lldb/tools/lldb-mi/MICmnStreamStdinLinux.cpp
@@ -209,3 +209,4 @@ const MIchar * CMICmnStreamStdinLinux::ReadLine( CMIUtilString & vwErrMsg )
 
 	return pText;
 }
+
diff --git a/lldb/tools/lldb-mi/MIDriver.cpp b/lldb/tools/lldb-mi/MIDriver.cpp
index 2125b847258..759d54a5364 100644
--- a/lldb/tools/lldb-mi/MIDriver.cpp
+++ b/lldb/tools/lldb-mi/MIDriver.cpp
@@ -847,7 +847,7 @@ FILE * CMIDriver::GetStderr( void ) const
 	// available before *this driver has been initialized! Flaw?
 
 	// This very likely to change later to a stream that the pass thru driver
-	// will write to and *this driver reads from to pass on the the CMICmnLog object
+	// will write to and *this driver reads from to pass on the CMICmnLog object
 	return stderr;
 }
 
@@ -1018,7 +1018,7 @@ bool CMIDriver::ExecuteCommand( const SMICmdData & vCmdData )
 
 //++ ------------------------------------------------------------------------------------
 // Details:	Set the MI Driver's exit application flag. The application checks this flag 
-//			after every stdin line is read so the exit may not be instantious.
+//			after every stdin line is read so the exit may not be instantaneous.
 //			If vbForceExit is false the MI Driver queries its state and determines if is
 //			should exit or continue operating depending on that running state.
 //			This is related to the running state of the MI driver.
@@ -1273,3 +1273,4 @@ bool CMIDriver::IsDriverDebuggingArgExecutable( void ) const
 {
 	return m_bDriverDebuggingArgExecutable;
 }
+
diff --git a/lldb/tools/lldb-mi/MIUtilSingletonBase.h b/lldb/tools/lldb-mi/MIUtilSingletonBase.h
index c3b4424d7d0..23e97101488 100644
--- a/lldb/tools/lldb-mi/MIUtilSingletonBase.h
+++ b/lldb/tools/lldb-mi/MIUtilSingletonBase.h
@@ -68,3 +68,4 @@ public:
 };
 
 } // namespace MI
+
diff --git a/lldb/tools/lldb-mi/MIUtilSingletonHelper.h b/lldb/tools/lldb-mi/MIUtilSingletonHelper.h
index 01bcc4f5bf9..ad36366830b 100644
--- a/lldb/tools/lldb-mi/MIUtilSingletonHelper.h
+++ b/lldb/tools/lldb-mi/MIUtilSingletonHelper.h
@@ -37,8 +37,8 @@ namespace MI
 // Type:	Template method.
 // Args:	vErrorResrcId	- (R)  The string resource ID error message identifier to place in errMsg.
 //			vwrbOk			- (RW) On input True = Try to initalise MI driver module.
-//								   On output True = MI driver module intialise successfully.
-//			vwrErrMsg		- (W)  MI driver module intialise error description on failure.
+//								   On output True = MI driver module initialise successfully.
+//			vwrErrMsg		- (W)  MI driver module initialise error description on failure.
 // Return:	MIstatus::success - Functional succeeded.
 //			MIstatus::failure - Functional failed.
 // Authors:	Aidan Dodds 17/03/2014.
@@ -65,7 +65,7 @@ bool ModuleInit( const MIint vErrorResrcId, bool & vwrbOk, CMIUtilString & vwrEr
 //			vwrbOk			- (W)  If not already false make false on module 
 //								   shutdown failure.
 //			vwrErrMsg		- (RW) Append to existing error description string MI 
-//								   driver module intialise error description on 
+//								   driver module initialise error description on 
 //								   failure.
 // Return:	True - Module shutdown succeeded.
 //			False - Module shutdown failed.
@@ -92,3 +92,4 @@ bool ModuleShutdown( const MIint vErrorResrcId, bool & vwrbOk, CMIUtilString & v
 }
 
 } // namespace MI
+
diff --git a/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp b/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
index d23c1646055..b1755a32a67 100644
--- a/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
+++ b/lldb/tools/lldb-mi/MIUtilSystemLinux.cpp
@@ -19,7 +19,7 @@
 // Copyright:	None.
 //--
 
-#if defined( __FreeBSD__ ) || defined( __linux )
+#if defined( __FreeBSD__ ) || defined( __linux__ )
 
 // In-house headers:
 #include "MIUtilSystemLinux.h"
@@ -116,4 +116,4 @@ bool CMIUtilSystemLinux::GetLogFilesPath( CMIUtilString & vrwFileNamePath ) cons
 	return MIstatus::success;
 }
 
-#endif // #if defined( __linux )
+#endif // #if defined( __linux__ )
diff --git a/lldb/tools/lldb-mi/MIUtilSystemLinux.h b/lldb/tools/lldb-mi/MIUtilSystemLinux.h
index c0276a4619a..1fd2c525992 100644
--- a/lldb/tools/lldb-mi/MIUtilSystemLinux.h
+++ b/lldb/tools/lldb-mi/MIUtilSystemLinux.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#if defined( __FreeBSD__ ) || defined( __linux )
+#if defined( __FreeBSD__ ) || defined( __linux__ )
 
 // In-house headers:
 #include "MIUtilString.h"  
@@ -54,4 +54,4 @@ public:
 
 typedef CMIUtilSystemLinux CMIUtilSystem;
 
-#endif // #if defined( __linux )
+#endif // #if defined( __linux__ )