From ed1e4b5b7da11b81852204c3929fcc5b736370ea Mon Sep 17 00:00:00 2001
From: robocop <robocop@users.sourceforge.net>
Date: Tue, 31 Mar 2015 02:10:38 +0000
Subject: [PATCH] Misc.

---
 doc/sql.extensions/README.regr_functions.txt | 2 +-
 src/common/StatusHolder.h                    | 2 +-
 src/common/unicode_util.cpp                  | 2 +-
 src/isql/isql.epp                            | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/sql.extensions/README.regr_functions.txt b/doc/sql.extensions/README.regr_functions.txt
index f59aaf3ba9..94ee227c11 100644
--- a/doc/sql.extensions/README.regr_functions.txt
+++ b/doc/sql.extensions/README.regr_functions.txt
@@ -11,7 +11,7 @@ Syntax:
     <function name> := { REGR_AVGX | REGR_AVGY | REGR_COUNT | REGR_INTERCEPT |
                          REGR_R2 | REGR_SLOPE | REGR_SXX | REGR_SXY | REGR_SYY }
 
-Formula use bellow variable.
+Formula use below variable.
 
 Y: <expr1> (<expr1> IS NOT NULL AND <expr2> IS NOT NULL).
 X: <expr2> (<expr1> IS NOT NULL AND <expr2> IS NOT NULL).
diff --git a/src/common/StatusHolder.h b/src/common/StatusHolder.h
index 2742c2351d..7c6be42a8d 100644
--- a/src/common/StatusHolder.h
+++ b/src/common/StatusHolder.h
@@ -124,7 +124,7 @@ public:
 		return SimpleStatusVector<S>::begin();
 	}
 
-	const unsigned length() const
+	unsigned length() const
 	{
 		return SimpleStatusVector<S>::getCount();
 	}
diff --git a/src/common/unicode_util.cpp b/src/common/unicode_util.cpp
index 3b97fede71..ba77825f4a 100644
--- a/src/common/unicode_util.cpp
+++ b/src/common/unicode_util.cpp
@@ -1131,7 +1131,7 @@ UnicodeUtil::ConversionICU& UnicodeUtil::getConversionICU()
 		if ((convIcu = ImplementConversionICU::create(favMaj, favMin)))
 			return *convIcu;
 	}
-	catch (const Exception& ex)
+	catch (const Exception&)
 	{ }
 
 	// Do a regular search
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
index 246493dfd0..512360b74d 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
@@ -8214,10 +8214,10 @@ static unsigned process_message_display(Firebird::IMessageMetadata* message, uns
 			if (!setValues.global_Cols.find(var.alias, &pad[i]) && setValues.global_Col_default)
 				pad[i] = setValues.global_Col_default;
 			disp_length = pad[i];
-		}
 
-		if ((type == SQL_TEXT || type == SQL_VARYING) && var.charSet == 4)
-			disp_length *= 4;
+			if (var.charSet == 4)
+				disp_length *= 4;
+		}
 
 		// The total line length
 		linelength += disp_length + 1;