Modified: xerces/c/trunk/src/xercesc/util/XMLUri.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUri.cpp?rev=675974&r1=675973&r2=675974&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/XMLUri.cpp (original) +++ xerces/c/trunk/src/xercesc/util/XMLUri.cpp Fri Jul 11 07:56:50 2008 @@ -122,13 +122,13 @@ // static const XMLCh errMsg_SCHEME[] = { - chLatin_S, chLatin_c, chLatin_h, chLatin_e, + chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_e, chNull }; static const XMLCh errMsg_SCHEMESPART[] = { - chLatin_S, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_e, + chLatin_s, chLatin_c, chLatin_h, chLatin_e, chLatin_m, chLatin_e, chLatin_S, chLatin_p, chLatin_e, chLatin_c, chLatin_i, chLatin_f, chLatin_i, chLatin_c, chLatin_P, chLatin_a, chLatin_r, chLatin_t, chNull @@ -136,24 +136,24 @@ static const XMLCh errMsg_PARAMS[] = { - chLatin_P, chLatin_a, chLatin_r, chLatin_a, chLatin_m, + chLatin_p, chLatin_a, chLatin_r, chLatin_a, chLatin_m, chLatin_e, chLatin_t, chLatin_e, chLatin_r, chLatin_s, chNull }; static const XMLCh errMsg_USERINFO[] = { - chLatin_U, chLatin_s, chLatin_e, chLatin_r, + chLatin_u, chLatin_s, chLatin_e, chLatin_r, chLatin_i, chLatin_n, chLatin_f, chLatin_o, chNull }; static const XMLCh errMsg_HOST[] = { - chLatin_H, chLatin_o, chLatin_s, chLatin_t, chNull + chLatin_h, chLatin_o, chLatin_s, chLatin_t, chNull }; static const XMLCh errMsg_PORT[] = { - chLatin_P, chLatin_o, chLatin_r, chLatin_t, chNull + chLatin_p, chLatin_o, chLatin_r, chLatin_t, chNull }; static const XMLCh errMsg_REGNAME[] = @@ -164,17 +164,17 @@ static const XMLCh errMsg_PATH[] = { - chLatin_P, chLatin_a, chLatin_t, chLatin_h, chNull + chLatin_p, chLatin_a, chLatin_t, chLatin_h, chNull }; static const XMLCh errMsg_QUERY[] = { - chLatin_Q, chLatin_u, chLatin_e, chLatin_r, chLatin_y, chNull + chLatin_q, chLatin_u, chLatin_e, chLatin_r, chLatin_y, chNull }; static const XMLCh errMsg_FRAGMENT[] = { - chLatin_F, chLatin_r, chLatin_a, chLatin_g, + chLatin_f, chLatin_r, chLatin_a, chLatin_g, chLatin_m, chLatin_e, chLatin_n, chLatin_t, chNull };
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=675974&r1=675973&r2=675974&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Fri Jul 11 07:56:50 2008 @@ -2316,7 +2316,6 @@ if (badContent) { reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidAttributeContent, - (name) ? SchemaSymbols::fgATT_NAME : SchemaSymbols::fgATT_REF, (name) ? name : ref); } @@ -2325,8 +2324,7 @@ if (fixedVal) { fixedVal = 0; - reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttributeDefaultFixedValue, - (name) ? SchemaSymbols::fgATT_NAME : SchemaSymbols::fgATT_REF, + reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttributeDefaultFixedValue, (name) ? name : ref); } @@ -2335,7 +2333,6 @@ useVal = 0; reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::NotOptionalDefaultAttValue, - (name) ? SchemaSymbols::fgATT_NAME : SchemaSymbols::fgATT_REF, (name) ? name : ref); } } @@ -2346,7 +2343,6 @@ // Check ref representation OK - 3.2.3::3.2 if (attForm || dvType || (simpleType != 0)) { reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttributeRefContentError, - (name) ? SchemaSymbols::fgATT_NAME : SchemaSymbols::fgATT_REF, (name) ? name : ref); } @@ -2545,8 +2541,7 @@ } if (ofTypeID && valueToCheck) { - reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttDeclPropCorrect3, - SchemaSymbols::fgATT_NAME, name); + reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttDeclPropCorrect3, name); } // check for multiple attributes with type derived from ID @@ -6028,8 +6023,7 @@ if (attDV) { if (attDV->getType() == DatatypeValidator::ID) { - reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttDeclPropCorrect3, - SchemaSymbols::fgATT_REF, refName); + reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::AttDeclPropCorrect3, refName); } else { try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
