You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2005/10/14 12:27:26 UTC

svn commit: r321067 - /webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c

Author: samisa
Date: Fri Oct 14 03:27:19 2005
New Revision: 321067

URL: http://svn.apache.org/viewcvs?rev=321067&view=rev
Log:
Added env relatedmodificaions

Modified:
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c?rev=321067&r1=321066&r2=321067&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c Fri Oct 14 03:27:19 2005
@@ -15,46 +15,52 @@
  */
 
 #include <axis2_om_output.h>
-
+#include <stdarg.h>
+#include <guththila_xml_stream_writer.h>
 
 axis2_om_output_t *
-axis2_create_om_output (FILE * stream)
+axis2_create_om_output (axis2_environment_t *environment, void* xml_writer)
 {
     axis2_om_output_t *om_output =
-        (axis2_om_output_t *) malloc (sizeof (axis2_om_output_t));
+        (axis2_om_output_t *) axis2_malloc (environment->allocator, sizeof (axis2_om_output_t));
 
     if (!om_output)
-        return 0;
-
-    om_output->out_stream = stream;
-    om_output->xml_writer =
-        guththila_create_xml_stream_writer (om_output->out_stream,
-                                            DEFAULT_CHAR_SET_ENCODING, 1);
-    om_output->do_optimize = 0;
+    {
+        environment->error->errorno = AXIS2_ERROR_NO_MEMORY;        
+		return NULL;
+    }
+	
+	om_output->xml_writer = NULL;
+	if (xml_writer)
+		om_output->xml_writer = xml_writer;
+	else
+		om_output->xml_writer = guththila_create_xml_stream_writer (stdout,
+                                            DEFAULT_CHAR_SET_ENCODING, AXIS2_TRUE);
+    om_output->do_optimize = AXIS2_FALSE;
     om_output->mime_boundary = 0;
     om_output->root_content_id = 0;
     om_output->next_id = 0;
-    om_output->is_soap_11 = 1;
-    om_output->char_set_encoding = 0;
-    om_output->xml_version = 0;
-    om_output->ignore_xml_declaration = 0;
+    om_output->is_soap_11 = AXIS2_TRUE;
+    om_output->char_set_encoding = NULL;
+    om_output->xml_version = NULL;
+    om_output->ignore_xml_declaration = AXIS2_TRUE;
 
     return om_output;
 }
 
 int
-axis2_om_output_write (axis2_om_output_t * om_output, axis2_om_types_t type,
+axis2_om_output_write (axis2_environment_t *environment, axis2_om_output_t * om_output, axis2_om_types_t type,
                        int no_of_args, ...)
 {
     int status = AXIS2_SUCCESS;
-    char *args_list[no_of_args];
+    axis2_char_t *args_list[no_of_args];
     int i = 0;
     va_list ap;
 
     va_start (ap, no_of_args);
     for (i = 0; i < no_of_args; i++)
     {
-        args_list[i] = va_arg (ap, char *);
+        args_list[i] = va_arg (ap, axis2_char_t *);
     }
     va_end (ap);