StatusArg.cpp (Firebird-3.0.2.32703-0.tar.bz2) | : | StatusArg.cpp (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 301 | skipping to change at line 301 | |||
{ | { | |||
dest->setWarnings2(len - warning, &v[warning]); | dest->setWarnings2(len - warning, &v[warning]); | |||
if (warning) | if (warning) | |||
dest->setErrors2(warning, v); | dest->setErrors2(warning, v); | |||
} | } | |||
else | else | |||
dest->setErrors2(len, v); | dest->setErrors2(len, v); | |||
} | } | |||
} | } | |||
void StatusVector::ImplStatusVector::appendTo(IStatus* dest) const throw() | ||||
{ | ||||
if (hasData()) | ||||
{ | ||||
ImplStatusVector tmpVector(dest); | ||||
ImplStatusVector newVector(getKind(), getCode()); | ||||
if (newVector.appendErrors(&tmpVector)) | ||||
{ | ||||
if (newVector.appendErrors(this)) | ||||
{ | ||||
if (newVector.appendWarnings(&tmpVector)) | ||||
newVector.appendWarnings(this); | ||||
} | ||||
} | ||||
// take special care about strings safety | ||||
// that's why tmpStatus is needed here | ||||
AutoPtr<IStatus, SimpleDispose> tmpStatus(dest->clone()); | ||||
newVector.copyTo(tmpStatus); | ||||
dest->setErrors(tmpStatus->getErrors()); | ||||
dest->setWarnings(tmpStatus->getWarnings()); | ||||
} | ||||
} | ||||
Gds::Gds(ISC_STATUS s) throw() : | Gds::Gds(ISC_STATUS s) throw() : | |||
StatusVector(isc_arg_gds, s) { } | StatusVector(isc_arg_gds, s) { } | |||
PrivateDyn::PrivateDyn(ISC_STATUS codeWithoutFacility) throw() : | PrivateDyn::PrivateDyn(ISC_STATUS codeWithoutFacility) throw() : | |||
Gds(ENCODE_ISC_MSG(codeWithoutFacility, DYN_MSG_FAC)) { } | Gds(ENCODE_ISC_MSG(codeWithoutFacility, DYN_MSG_FAC)) { } | |||
Num::Num(ISC_STATUS s) throw() : | Num::Num(ISC_STATUS s) throw() : | |||
Base(isc_arg_number, s) { } | Base(isc_arg_number, s) { } | |||
Interpreted::Interpreted(const char* text) throw() : | Interpreted::Interpreted(const char* text) throw() : | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 26 lines changed or added |