You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by pe...@apache.org on 2004/09/08 21:56:05 UTC

cvs commit: xml-xerces/c/src/xercesc/framework/psvi XSValue.hpp XSValue.cpp

peiyongz    2004/09/08 12:56:05

  Modified:    c/src/xercesc/framework/psvi XSValue.hpp XSValue.cpp
  Log:
  Remove parameter toValidate from validation interface
  
  Revision  Changes    Path
  1.9       +4 -6      xml-xerces/c/src/xercesc/framework/psvi/XSValue.hpp
  
  Index: XSValue.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSValue.hpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XSValue.hpp	8 Sep 2004 13:56:09 -0000	1.8
  +++ XSValue.hpp	8 Sep 2004 19:56:05 -0000	1.9
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.9  2004/09/08 19:56:05  peiyongz
  + * Remove parameter toValidate from validation interface
  + *
    * Revision 1.8  2004/09/08 13:56:09  peiyongz
    * Apache License Version 2.0
    *
  @@ -143,7 +146,6 @@
                 ,       DataType              datatype
                 ,       Status&               status
                 ,       XMLVersion            version    = ver_10
  -              ,       bool                  toValidate = true 
                 ,       MemoryManager*  const manager    = XMLPlatformUtils::fgMemoryManager
                );
   
  @@ -255,7 +257,6 @@
                 ,       DataType              datatype
                 ,       Status&               status
                 ,       XMLVersion            version
  -              ,       bool                  toValidate
                 ,       MemoryManager*  const manager
                );
   
  @@ -266,7 +267,6 @@
                 ,       DataType              datatype
                 ,       Status&               status
                 ,       XMLVersion            version
  -              ,       bool                  toValidate
                 ,       MemoryManager*  const manager
                );
   
  @@ -277,7 +277,6 @@
                 ,       DataType              datatype
                 ,       Status&               status
                 ,       XMLVersion            version
  -              ,       bool                  toValidate
                 ,       MemoryManager*  const manager
                );
   
  @@ -353,7 +352,6 @@
                    const XMLCh*         const content
                  ,       Status&               status
                  ,       XMLVersion            version    
  -               ,       bool                  toValidate 
                  ,       int                   ct
                  ,       t_value&              retVal               
                  ,       int                   base
  
  
  
  1.9       +11 -20    xml-xerces/c/src/xercesc/framework/psvi/XSValue.cpp
  
  Index: XSValue.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSValue.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XSValue.cpp	8 Sep 2004 13:56:09 -0000	1.8
  +++ XSValue.cpp	8 Sep 2004 19:56:05 -0000	1.9
  @@ -16,6 +16,9 @@
   
   /*
    * $Log$
  + * Revision 1.9  2004/09/08 19:56:05  peiyongz
  + * Remove parameter toValidate from validation interface
  + *
    * Revision 1.8  2004/09/08 13:56:09  peiyongz
    * Apache License Version 2.0
    *
  @@ -231,7 +234,6 @@
                        ,       DataType             datatype
                        ,       Status&              status
                        ,       XMLVersion           version
  -                     ,       bool                 toValidate
                        ,       MemoryManager* const manager)
   {
   
  @@ -241,13 +243,13 @@
       switch (inGroup[datatype])
       {
       case XSValue::dg_numerics :
  -        return validateNumerics(content, datatype, status, version, toValidate, manager);
  +        return validateNumerics(content, datatype, status, version, manager);
           break;
       case XSValue::dg_datetimes:
  -        return validateDateTimes(content, datatype, status, version, toValidate, manager);
  +        return validateDateTimes(content, datatype, status, version, manager);
           break;
       case XSValue::dg_strings:
  -        return validateStrings(content, datatype, status, version, toValidate, manager);
  +        return validateStrings(content, datatype, status, version, manager);
           break;
       default:
           status = st_UnknownType;
  @@ -331,7 +333,6 @@
                           ,       DataType             datatype
                           ,       Status&              status
                           ,       XMLVersion           version
  -                        ,       bool                 toValidate
                           ,       MemoryManager* const manager)
   {
   
  @@ -510,7 +511,6 @@
                                     content
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_long
                                   , actVal
                                   , base_decimal
  @@ -571,7 +571,6 @@
                                     content
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_ulong
                                   , actVal
                                   , base_decimal
  @@ -630,7 +629,6 @@
                                 ,       DataType             datatype
                                 ,       Status&              status
                                 ,       XMLVersion           version
  -                              ,       bool                 toValidate
                                 ,       MemoryManager* const manager)
   {
   
  @@ -689,7 +687,6 @@
                               ,       DataType             datatype
                               ,       Status&              status
                               ,       XMLVersion           version
  -                            ,       bool                 toValidate
                               ,       MemoryManager* const manager)
   {
   
  @@ -976,7 +973,7 @@
           // All getCanonicalRepresentation does lexcial space validation only
           // (no range checking), therefore if validation is requied,
           // we need to pass the content to the validate interface for complete checking
  -        if (toValidate && !validateNumerics(content, datatype, status, version, toValidate, manager))
  +        if (toValidate && !validateNumerics(content, datatype, status, version, manager))
               return 0;
   
           XMLCh* retVal;
  @@ -1052,7 +1049,7 @@
           case XSValue::dt_gDay:
           case XSValue::dt_gMonth:
               {
  -                if (toValidate && !validateDateTimes(content, datatype, status, version, toValidate, manager))
  +                if (toValidate && !validateDateTimes(content, datatype, status, version, manager))
                       status = st_Invalid;
                   else
                       status = st_NoCanRep;
  @@ -1142,7 +1139,7 @@
           case XSValue::dt_ENTITIES:
           case XSValue::dt_IDREFS:
               {
  -                if (toValidate && !validateStrings(content, datatype, status, version, toValidate, manager))
  +                if (toValidate && !validateStrings(content, datatype, status, version, manager))
                       status = st_Invalid;
                   else
                       status = st_NoCanRep;
  @@ -1190,7 +1187,6 @@
                                     &(intVal[totalDigit - scale])
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_ulong
                                   , actValFract
                                   , base_decimal
  @@ -1207,7 +1203,6 @@
                                     intVal
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_ulong
                                   , actValInt
                                   , base_decimal
  @@ -1281,7 +1276,6 @@
                                     content
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_long
                                   , actVal
                                   , base_decimal
  @@ -1360,7 +1354,6 @@
                                     content
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_long
                                   , actVal
                                   , base_decimal
  @@ -1437,7 +1430,6 @@
                                     content
                                   , status
                                   , version
  -                                , toValidate
                                   , convert_2_ulong
                                   , actVal
                                   , base_decimal
  @@ -1669,7 +1661,7 @@
           case XSValue::dt_ENTITIES:
           case XSValue::dt_IDREFS:
               {
  -                if (toValidate && !validateStrings(content, datatype, status, version, toValidate, manager))
  +                if (toValidate && !validateStrings(content, datatype, status, version, manager))
                       status = st_Invalid;
                   else
                       status = st_NoActVal;
  @@ -1696,7 +1688,6 @@
   bool XSValue::getActualValue(const XMLCh*         const content
                              ,       Status&              status
                              ,       XMLVersion           version    
  -                           ,       bool                 toValidate 
                              ,       int                  ct
                              ,       t_value&             retVal               
                              ,       int                  base
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org