[Firebird-checkins] CVS: firebird2/src/utilities/ntrace TraceConfiguration.cpp, 1.26, 1.27 TracePluginImpl.cpp, 1.39, 1.40 TracePluginImpl.h, 1.15, 1.16 TraceUnicodeUtils.cpp, 1.4, 1.5 TraceUnicodeUtils.h, 1.5, 1.6

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

Build Version :  T3.0.0.28126 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.28301 2010/03/30 00:25:53 asfernandes )

Update of /cvsroot/firebird/firebird2/src/utilities/ntrace
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28015/src/utilities/ntrace

Modified Files:
	TraceConfiguration.cpp TracePluginImpl.cpp TracePluginImpl.h 
	TraceUnicodeUtils.cpp TraceUnicodeUtils.h 
Log Message:
Misc


Index: TraceConfiguration.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ntrace/TraceConfiguration.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -U3 -r1.26 -r1.27
--- TraceConfiguration.cpp	27 Mar 2010 20:06:31 -0000	1.26
+++ TraceConfiguration.cpp	30 Mar 2010 00:25:52 -0000	1.27
@@ -153,7 +153,7 @@
 #endif
 
 					UnicodeCollationHolder unicodeCollation(*getDefaultMemoryPool());
-					Jrd::TextType *textType = unicodeCollation.getTextType();
+					Jrd::TextType* textType = unicodeCollation.getTextType();
 
 					SimilarToMatcher<ULONG, Jrd::CanonicalConverter<SimilarConverter> > matcher(
 						*getDefaultMemoryPool(), textType, (const UCHAR*) pattern.c_str(),

Index: TracePluginImpl.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ntrace/TracePluginImpl.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -U3 -r1.39 -r1.40
--- TracePluginImpl.cpp	27 Mar 2010 20:06:31 -0000	1.39
+++ TracePluginImpl.cpp	30 Mar 2010 00:25:52 -0000	1.40
@@ -140,7 +140,7 @@
 			PluginLogWriter(logname.c_str(), config.max_log_size * 1024 * 1024);
 	}
 
-	Jrd::TextType *textType = unicodeCollation.getTextType();
+	Jrd::TextType* textType = unicodeCollation.getTextType();
 
 	// Compile filtering regular expressions
 	if (config.include_filter.hasData())

Index: TracePluginImpl.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ntrace/TracePluginImpl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -U3 -r1.15 -r1.16
--- TracePluginImpl.h	27 Mar 2010 20:06:31 -0000	1.15
+++ TracePluginImpl.h	30 Mar 2010 00:25:52 -0000	1.16
@@ -329,4 +329,5 @@
 		TraceService* service, ntrace_result_t detach_result);
 };
 
+
 #endif // TRACEPLUGINIMPL_H

Index: TraceUnicodeUtils.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ntrace/TraceUnicodeUtils.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -U3 -r1.4 -r1.5
--- TraceUnicodeUtils.cpp	27 Mar 2010 20:06:31 -0000	1.4
+++ TraceUnicodeUtils.cpp	30 Mar 2010 00:25:52 -0000	1.5
@@ -49,7 +49,6 @@
 	if (!IntlUtil::initUnicodeCollation(tt, cs, "UNICODE", 0, collAttributesBuffer, string()))
 		fatal_exception::raiseFmt("cannot initialize UNICODE collation to use in trace plugin");
 
-
 	charSet = Jrd::CharSet::createInstance(pool, 0, cs);
 	textType = FB_NEW(pool) Jrd::TextType(0, tt, charSet);
 }

Index: TraceUnicodeUtils.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ntrace/TraceUnicodeUtils.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- TraceUnicodeUtils.h	28 Mar 2010 03:47:26 -0000	1.5
+++ TraceUnicodeUtils.h	30 Mar 2010 00:25:52 -0000	1.6
@@ -34,11 +34,12 @@
 #include "../../jrd/TextType.h"
 #include "../../jrd/unicode_util.h"
 
+
 class UnicodeCollationHolder
 {
 private:
-	charset *cs;
-	texttype *tt;
+	charset* cs;
+	texttype* tt;
 	Firebird::AutoPtr<Jrd::CharSet> charSet;
 	Firebird::AutoPtr<Jrd::TextType> textType;
 
@@ -46,7 +47,10 @@
 	explicit UnicodeCollationHolder(Firebird::MemoryPool& pool);
 	~UnicodeCollationHolder();
 
-	Jrd::TextType* getTextType() { return textType; }
+	Jrd::TextType* getTextType()
+	{
+		return textType;
+	}
 };