From fc81223045fd01b87abc511fa2ca479bc4645a34 Mon Sep 17 00:00:00 2001
From: Alexander Chemeris <Alexander.Chemeris@gmail.com>
Date: Tue, 21 Dec 2010 16:58:05 +0300
Subject: [PATCH] Fix a bunch of typos. (cherry picked from commits
 2da5a28a076566d45ef861fbc5571fc3f059e685,
 6cddd36139621e6c51533ac9a7068c2e1c5c2a4e.
 7852c1e572abbc9fee2548a58e377cfbb3eff46d,
 f85d5b3f528ba19c598cbe77bad2566920bf9dd4,
 0f8766a506f25118f732cca10fe44a1c9a0ace6a,
 26adfe2d158e6a80d50b4e247c1539b5a07add9f)

---
 public-trunk/CommonLibs/BitVector.h    | 2 +-
 public-trunk/CommonLibs/Logger.h       | 4 ++--
 public-trunk/Control/ControlCommon.cpp | 2 +-
 public-trunk/Control/ControlCommon.h   | 5 ++---
 public-trunk/SIP/SIPInterface.cpp      | 6 +++---
 public-trunk/smqueue/smcommands.cpp    | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/public-trunk/CommonLibs/BitVector.h b/public-trunk/CommonLibs/BitVector.h
index 8ef223b..d60a21d 100644
--- a/public-trunk/CommonLibs/BitVector.h
+++ b/public-trunk/CommonLibs/BitVector.h
@@ -328,7 +328,7 @@ class BitVector : public Vector<char> {
 	/** Pack into a char array. */
 	void pack(unsigned char*) const;
 
-	/** Unopack from a char array. */
+	/** Unpack from a char array. */
 	void unpack(const unsigned char*);
 
 	/** Make a hexdump string. */
diff --git a/public-trunk/CommonLibs/Logger.h b/public-trunk/CommonLibs/Logger.h
index bdcaf28..b014250 100644
--- a/public-trunk/CommonLibs/Logger.h
+++ b/public-trunk/CommonLibs/Logger.h
@@ -77,7 +77,7 @@ class Log {
 	protected:
 
 	std::ostringstream mStream;	///< This is where we write the long.
-	Level mReportLevel;			///< Level of current repot.
+	Level mReportLevel;			///< Level of current report.
 
 	static FILE *sFile;
 
@@ -87,7 +87,7 @@ class Log {
 		:mReportLevel(wReportLevel)
 	{ }
 
-	// Most of the work in in the desctructor.
+	// Most of the work is in the destructor.
 	~Log();
 
 	std::ostringstream& get();
diff --git a/public-trunk/Control/ControlCommon.cpp b/public-trunk/Control/ControlCommon.cpp
index 9f92f53..07d2364 100644
--- a/public-trunk/Control/ControlCommon.cpp
+++ b/public-trunk/Control/ControlCommon.cpp
@@ -322,7 +322,7 @@ bool TransactionTable::find(const L3MobileIdentity& mobileID, TransactionEntry&
 
 	// Since clearDeadEntries is also linear, do that here, too.
 
-	// Brtue force search.
+	// Brute force search.
 	bool foundIt = false;
 	mLock.lock();
 	clearDeadEntries();
diff --git a/public-trunk/Control/ControlCommon.h b/public-trunk/Control/ControlCommon.h
index ff950b5..f638394 100644
--- a/public-trunk/Control/ControlCommon.h
+++ b/public-trunk/Control/ControlCommon.h
@@ -516,7 +516,7 @@ class TransactionEntry {
 	/** Reset all Q.931 timers. */
 	void resetTimers();
 
-	/** Retrns true if the transaction is "dead". */
+	/** Returns true if the transaction is "dead". */
 	bool dead() const;
 
 	private:
@@ -596,7 +596,7 @@ class TransactionTable {
 		Also clears dead entries during search.
 		@param mobileID The mobile at to search for.
 		@param target A TransactionEntry to accept the found record.
-		@return true is the mobile ID was foind.
+		@return true is the mobile ID was found.
 	*/
 	bool find(const GSM::L3MobileIdentity& mobileID, TransactionEntry& target);
 
@@ -707,7 +707,6 @@ class TMSITable {
 		@param TMSI The TMSI to find.
 		@param target A TMSI record to catch the result.
 		@return true if the TMSI was found.
-		@return Pointer to c-string IMSI or NULL.
 	*/
 	bool find(unsigned TMSI, TMSIRecord& target);
 
diff --git a/public-trunk/SIP/SIPInterface.cpp b/public-trunk/SIP/SIPInterface.cpp
index 5f6c367..7caf1e4 100644
--- a/public-trunk/SIP/SIPInterface.cpp
+++ b/public-trunk/SIP/SIPInterface.cpp
@@ -300,12 +300,12 @@ bool SIPInterface::checkInvite( osip_message_t * msg )
 	// IMSIs are 14 or 15 char + "IMSI" prefix
 	unsigned namelen = strlen(IMSI);
 	if ((namelen>19)||(namelen<18)) {
-		LOG(WARN) << "INVITE with malformed username \"" << IMSI << "\"";
+		LOG(WARN) << "INVITE/MESSAGE with malformed username \"" << IMSI << "\"";
 		return false;
 	}
 	// Skip first 4 char "IMSI".
 	IMSI+=4;
-	// Make the mobile id we need for transaction and paging enties.
+	// Make the mobile id we need for transaction and paging entries.
 	L3MobileIdentity mobile_id(IMSI);
 
 	// Check SIP map.  Repeated entry?  Page again.
@@ -343,7 +343,7 @@ bool SIPInterface::checkInvite( osip_message_t * msg )
 	if (!callerID) {
 		callerID = emptyString;
 		callerHost = emptyString;
-		LOG(NOTICE) << "INVITE with no From: username for " << mobile_id;
+		LOG(NOTICE) << "INVITE/MESSAGE with no From: username for " << mobile_id;
 	}
 	LOG(DEBUG) << "callerID " << callerID << "@" << callerHost;
 	// Build the transaction table entry.
diff --git a/public-trunk/smqueue/smcommands.cpp b/public-trunk/smqueue/smcommands.cpp
index 38acd9a..3f475f3 100644
--- a/public-trunk/smqueue/smcommands.cpp
+++ b/public-trunk/smqueue/smcommands.cpp
@@ -316,7 +316,7 @@ shortcode_register (const char *imsi, const char *msgtext,
 			LOG(DEBUG) << phonenum << " is already in the HLR";
 			answer << gConfig.getStr("SC.Register.Msg.TakenA")
 			       << ' ' << phonenum << ' '
-			       << gConfig.getStr("SC.Register.Msg.TAkenB");
+			       << gConfig.getStr("SC.Register.Msg.TakenB");
 		} else {
 			LOG(DEBUG) << phonenum << " is not in the HLR";
 			// Neither the IMSI nor the phonenum is in use.