[Firebird-checkins] CVS: firebird2/src/jrd ini.h,1.27,1.28

[Dmitry Y. <di...@us...>]

Build Version :  T2.1.0.16774 Firebird 2.1 Beta 2

(writeBuildNum.sh,v 1.16932 2007/09/28 12:54:53 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17:/tmp/cvs-serv28454

Modified Files:
	ini.h 
Log Message:
Fixed an UCHAR overflow causing wrong entries in RDB$TYPES.

Index: ini.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/ini.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -U3 -r1.27 -r1.28
--- ini.h	6 Apr 2007 02:10:10 -0000	1.27
+++ ini.h	28 Sep 2007 12:54:51 -0000	1.28
@@ -160,14 +160,14 @@
 struct rtyp {
 	const TEXT* rtyp_name;
 	SSHORT rtyp_value;
-	UCHAR rtyp_field;
+	int rtyp_field;
 };
 
-#define TYPE(text, type, field)	{ text, type, (UCHAR) field },
+#define TYPE(text, type, field)	{ text, type, field },
 
 #define CHARSET(name, cs_id, coll_id, bytes, num, s1, s2, attr) \
-				{(name), (cs_id),   (UCHAR) nam_charset_name},
-#define CSALIAS(name, cs_id)	{(name), (cs_id),   (UCHAR) nam_charset_name},
+				{name, cs_id, nam_charset_name},
+#define CSALIAS(name, cs_id)	{name, cs_id, nam_charset_name},
 #define COLLATION(name, base_name, cc_id, cs_id, coll_id, sym, attr, specific_attr)
 #define END_CHARSET