[Firebird-checkins] CVS: firebird2/src/jrd blb.cpp, 1.209, 1.210 blob_filter.cpp, 1.45, 1.46

[Adriano d. S. F. <asf...@us...>]

Build Version :  T3.0.0.25759 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.25927 2009/10/13 15:49:39 asfernandes )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28628/src/jrd

Modified Files:
	blb.cpp blob_filter.cpp 
Log Message:
Misc

Index: blb.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/blb.cpp,v
retrieving revision 1.209
retrieving revision 1.210
diff -b -U3 -r1.209 -r1.210
--- blb.cpp	13 Oct 2009 08:22:56 -0000	1.209
+++ blb.cpp	13 Oct 2009 15:49:38 -0000	1.210
@@ -309,16 +309,16 @@
 			filter_required = true;
 		}
 	}
-	else if (to == isc_blob_text && (from_charset != to_charset))
+	else if (to == isc_blob_text && from_charset != to_charset)
 	{
 		if (from_charset == CS_dynamic)
 			from_charset = tdbb->getAttachment()->att_charset;
 		if (to_charset == CS_dynamic)
 			to_charset = tdbb->getAttachment()->att_charset;
 
-		if ((to_charset != CS_NONE) && (from_charset != CS_NONE) &&
-			(to_charset != CS_BINARY) && (from_charset != CS_BINARY) &&
-			(from_charset != to_charset))
+		if (to_charset != CS_NONE && from_charset != CS_NONE &&
+			to_charset != CS_BINARY && from_charset != CS_BINARY &&
+			from_charset != to_charset)
 		{
 			filter = find_filter(tdbb, from, to);
 			filter_required = true;
@@ -1411,16 +1411,16 @@
 		filter = find_filter(tdbb, from, to);
 		filter_required = true;
 	}
-	else if (to == isc_blob_text && (from_charset != to_charset))
+	else if (to == isc_blob_text && from_charset != to_charset)
 	{
 		if (from_charset == CS_dynamic)
 			from_charset = tdbb->getAttachment()->att_charset;
 		if (to_charset == CS_dynamic)
 			to_charset = tdbb->getAttachment()->att_charset;
 
-		if ((to_charset != CS_NONE) && (from_charset != CS_NONE) &&
-			(to_charset != CS_BINARY) && (from_charset != CS_BINARY) &&
-			(from_charset != to_charset))
+		if (to_charset != CS_NONE && from_charset != CS_NONE &&
+			to_charset != CS_BINARY && from_charset != CS_BINARY &&
+			from_charset != to_charset)
 		{
 			filter = find_filter(tdbb, from, to);
 			filter_required = true;

Index: blob_filter.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/blob_filter.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -U3 -r1.45 -r1.46
--- blob_filter.cpp	23 Aug 2009 12:26:59 -0000	1.45
+++ blob_filter.cpp	13 Oct 2009 15:49:38 -0000	1.46
@@ -220,7 +220,8 @@
 		result->blf_from = from;
 		result->blf_to = to;
 		result->blf_filter = filters[from];
-		result->blf_exception_message.printf("Exception occurred in system provided internal filters for filtering internal subtype %d to text.",
+		result->blf_exception_message.printf("Exception occurred in system provided internal "
+				"filters for filtering internal subtype %d to text.",
 				from);
 		return result;
 	}