[Firebird-checkins] SF.net SVN: firebird:[61178] firebird/trunk

[<ro...@us...>]

Revision: 61178
          http://sourceforge.net/p/firebird/code/61178
Author:   robocop
Date:     2015-03-31 02:10:38 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/doc/sql.extensions/README.regr_functions.txt
    firebird/trunk/src/common/StatusHolder.h
    firebird/trunk/src/common/unicode_util.cpp
    firebird/trunk/src/isql/isql.epp

Modified: firebird/trunk/doc/sql.extensions/README.regr_functions.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.regr_functions.txt	2015-03-31 00:21:15 UTC (rev 61177)
+++ firebird/trunk/doc/sql.extensions/README.regr_functions.txt	2015-03-31 02:10:38 UTC (rev 61178)
@@ -11,7 +11,7 @@
     <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).

Modified: firebird/trunk/src/common/StatusHolder.h
===================================================================
--- firebird/trunk/src/common/StatusHolder.h	2015-03-31 00:21:15 UTC (rev 61177)
+++ firebird/trunk/src/common/StatusHolder.h	2015-03-31 02:10:38 UTC (rev 61178)
@@ -124,7 +124,7 @@
 		return SimpleStatusVector<S>::begin();
 	}
 
-	const unsigned length() const
+	unsigned length() const
 	{
 		return SimpleStatusVector<S>::getCount();
 	}

Modified: firebird/trunk/src/common/unicode_util.cpp
===================================================================
--- firebird/trunk/src/common/unicode_util.cpp	2015-03-31 00:21:15 UTC (rev 61177)
+++ firebird/trunk/src/common/unicode_util.cpp	2015-03-31 02:10:38 UTC (rev 61178)
@@ -1131,7 +1131,7 @@
 		if ((convIcu = ImplementConversionICU::create(favMaj, favMin)))
 			return *convIcu;
 	}
-	catch (const Exception& ex)
+	catch (const Exception&)
 	{ }
 
 	// Do a regular search

Modified: firebird/trunk/src/isql/isql.epp
===================================================================
--- firebird/trunk/src/isql/isql.epp	2015-03-31 00:21:15 UTC (rev 61177)
+++ firebird/trunk/src/isql/isql.epp	2015-03-31 02:10:38 UTC (rev 61178)
@@ -8214,11 +8214,11 @@
 			if (!setValues.global_Cols.find(var.alias, &pad[i]) && setValues.global_Col_default)
 				pad[i] = setValues.global_Col_default;
 			disp_length = pad[i];
+
+			if (var.charSet == 4)
+				disp_length *= 4;
 		}
 
-		if ((type == SQL_TEXT || type == SQL_VARYING) && var.charSet == 4)
-			disp_length *= 4;
-
 		// The total line length
 		linelength += disp_length + 1;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.