From: Adriano d. S. F. <asf...@us...> - 2008-12-31 20:22:40
|
Build Version : T2.5.0.22085 Firebird 2.5 Alpha 1 (writeBuildNum.sh,v 1.22246 2008/12/31 20:22:04 asfernandes ) Update of /cvsroot/firebird/firebird2/src/common In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16521/src/common Modified Files: cvt.cpp Log Message: Misc Index: cvt.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/common/cvt.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -b -U3 -r1.8 -r1.9 --- cvt.cpp 31 Dec 2008 05:05:48 -0000 1.8 +++ cvt.cpp 31 Dec 2008 20:22:01 -0000 1.9 @@ -1764,8 +1764,8 @@ fb_assert(desc != NULL); fb_assert(address != NULL); fb_assert(err != NULL); - fb_assert((((temp != NULL) && (length > 0)) || - ((INTL_TTYPE(desc) <= dtype_any_text) && (INTL_TTYPE(desc) == to_interp)))); + fb_assert(((temp != NULL && length > 0) || + (INTL_TTYPE(desc) <= dtype_any_text && INTL_TTYPE(desc) == to_interp))); if (desc->dsc_dtype <= dtype_any_text && INTL_TTYPE(desc) == to_interp) { *address = reinterpret_cast<char*>(desc->dsc_address); @@ -1956,7 +1956,7 @@ { err(Arg::Gds(isc_arith_except) << Arg::Gds(isc_numeric_out_of_range)); } - else if (((*p > '8') && (sign == -1)) || ((*p > '7') && (sign != -1))) + else if ((*p > '8' && sign == -1) || (*p > '7' && sign != -1)) { err(Arg::Gds(isc_arith_except) << Arg::Gds(isc_numeric_out_of_range)); } @@ -2083,9 +2083,9 @@ fb_assert(ttype != NULL); fb_assert(address != NULL); fb_assert(err != NULL); - fb_assert(((temp != NULL) && (length > 0)) || - (desc->dsc_dtype == dtype_text) || - (desc->dsc_dtype == dtype_cstring) || (desc->dsc_dtype == dtype_varying)); + fb_assert((temp != NULL && length > 0) || + desc->dsc_dtype == dtype_text || + desc->dsc_dtype == dtype_cstring || desc->dsc_dtype == dtype_varying); /* If the value is already a string (fixed or varying), just return the address and length. */ |