cvs commit: xml-xalan/c/src/XalanTransformer XalanCAPI.h XalanCAPI.cpp

[auriemma]

auriemma    01/02/02 06:16:31

  Modified:    c/src/XalanTransformer XalanCAPI.h XalanCAPI.cpp
  Log:
  Removed assignment of XalanHandle to NULL or 0 and change cast to be more 
consistant with other files.
  
  Revision  Changes    Path
  1.4       +2 -2      xml-xalan/c/src/XalanTransformer/XalanCAPI.h
  
  Index: XalanCAPI.h
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanCAPI.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanCAPI.h       2001/01/31 18:56:28     1.3
  +++ XalanCAPI.h       2001/02/02 14:16:30     1.4
  @@ -130,7 +130,7 @@
         * @param theXalanHandle The XalanTransformer to destroy.
         */
        XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
  -     DeleteXalanTransformer(XalanHandle*     theXalanHandle);
  +     DeleteXalanTransformer(XalanHandle      theXalanHandle);
   
        /**
         * Transform the XML source tree to the given result file.
  @@ -177,7 +177,7 @@
         * @param theStream The address of character data.
         */
        XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
  -     XalanFreeData(char**                            theStream);
  +     XalanFreeData(char*             theStream);
   
        /**
         * Transform the XML source tree to the address of a callback.
  
  
  
  1.5       +28 -52    xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp
  
  Index: XalanCAPI.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanCAPI.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XalanCAPI.cpp     2001/02/01 19:11:42     1.4
  +++ XalanCAPI.cpp     2001/02/02 14:16:30     1.5
  @@ -85,22 +85,16 @@
   
   XALAN_TRANSFORMER_EXPORT_FUNCTION(XalanHandle)
   CreateXalanTransformer()
  -{
  -     XalanTransformer* theXalanTransformer = new XalanTransformer();
  -     return theXalanTransformer;
  +{    
  +     return new XalanTransformer();
   }
   
   
   
   XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
  -DeleteXalanTransformer(XalanHandle* theXalanHandle)
  +DeleteXalanTransformer(XalanHandle theXalanHandle)
   {
  -     if(*theXalanHandle != NULL)
  -     {
  -             XalanTransformer* theXalanTransformer = (XalanTransformer*) 
*theXalanHandle;
  -             delete  theXalanTransformer;
  -             *theXalanHandle = NULL;
  -     }
  +     delete  theXalanHandle;
   }
   
   
  @@ -112,17 +106,11 @@
                        const char*             theOutFileName,
                        XalanHandle             theXalanHandle)
   {
  -     int status = true;
  -
  -     if(theXalanHandle != NULL)
  -     {
  -             XalanTransformer* theXalanTransformer = (XalanTransformer*) 
theXalanHandle;
  -
  -             // Do the transformation...
  -             status = theXalanTransformer->transform(theXMLFileName, 
theXSLFileName, theOutFileName);
  -     }
  -
  -     return status;
  +#if defined(XALAN_OLD_STYLE_CASTS)
  +     return ((XalanTransformer*)theXalanHandle)->transform(theXMLFileName, 
theXSLFileName, theOutFileName);
  +#else
  +     return  
static_cast<XalanTransformer*>(theXalanHandle)->transform(theXMLFileName, 
theXSLFileName, theOutFileName);
  +#endif       
   }
   
   
  @@ -137,37 +125,31 @@
   #if !defined(XALAN_NO_NAMESPACES)
        using std::ostrstream;
   #endif
  -
  -     int status = true;
  -
  -     if(theXalanHandle != NULL)
  -     {
  -             XalanTransformer* theXalanTransformer = (XalanTransformer*) 
theXalanHandle;
   
  -             ostrstream      theOutputStream;        
  +     int status = true;              
   
  -             // Do the transformation...
  -             status = theXalanTransformer->transform(theXMLFileName, 
theXSLFileName, &theOutputStream);
  +     ostrstream      theOutputStream;        
   
  -             // Null-terminate the data.
  -             theOutputStream << '\0';
  -
  -             *theOutput = theOutputStream.str();
  -     }
  +     // Do the transformation...
  +#if defined(XALAN_OLD_STYLE_CASTS)
  +     status = ((XalanTransformer*)theXalanHandle)->transform(theXMLFileName, 
theXSLFileName, &theOutputStream);
  +#else
  +     status = 
static_cast<XalanTransformer*>(theXalanHandle)->transform(theXMLFileName, 
theXSLFileName, &theOutputStream);
  +#endif
  +     // Null-terminate the data.
  +     theOutputStream << '\0';
   
  +     *theOutput = theOutputStream.str();
  +     
        return status;
   }
   
   
   
   XALAN_TRANSFORMER_EXPORT_FUNCTION(void)
  -XalanFreeData(char** theStream)
  +XalanFreeData(char*  theStream)
   {
  -     if(*theStream != NULL)
  -     {
  -             delete[] *theStream;
  -             *theStream = NULL;
  -     }
  +     delete[] theStream;
   }
   
   
  @@ -180,15 +162,9 @@
                        const void*                             
theOutputHandle, 
                        XalanOutputHandlerType  theOutputHandler)
   {
  -     int status = true;
  -
  -     if(theXalanHandle != NULL)
  -     {
  -             XalanTransformer* theXalanTransformer = (XalanTransformer*) 
theXalanHandle;
  -
  -             // Do the transformation...
  -             status = theXalanTransformer->transform(theXMLFileName, 
theXSLFileName, theOutputHandle, theOutputHandler);
  -     }
  -
  -     return status;
  +#if defined(XALAN_OLD_STYLE_CASTS)
  +     return ((XalanTransformer*)theXalanHandle)->transform(theXMLFileName, 
theXSLFileName, theOutputHandle, theOutputHandler);
  +#else
  +     return  
static_cast<XalanTransformer*>(theXalanHandle)->transform(theXMLFileName, 
theXSLFileName, theOutputHandle, theOutputHandler);
  +#endif       
   }