Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 23593 invoked from network); 24 Mar 2008 10:51:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Mar 2008 10:51:51 -0000 Received: (qmail 213 invoked by uid 500); 24 Mar 2008 10:51:48 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 99995 invoked by uid 500); 24 Mar 2008 10:51:48 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 99984 invoked by uid 500); 24 Mar 2008 10:51:48 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 99981 invoked by uid 99); 24 Mar 2008 10:51:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2008 03:51:47 -0700 X-ASF-Spam-Status: No, hits=-1999.5 required=10.0 tests=ALL_TRUSTED,UPPERCASE_50_75 X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Mar 2008 10:51:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 481AA1A9832; Mon, 24 Mar 2008 03:51:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r640373 - /webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Date: Mon, 24 Mar 2008 10:51:27 -0000 To: axis2-cvs@ws.apache.org From: kaushalye@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080324105128.481AA1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kaushalye Date: Mon Mar 24 03:50:58 2008 New Revision: 640373 URL: http://svn.apache.org/viewvc?rev=640373&view=rev Log: Axis2c hackathon : Error handling in libxml2 parser Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c?rev=640373&r1=640372&r2=640373&view=diff ============================================================================== --- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c (original) +++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Mon Mar 24 03:50:58 2008 @@ -359,6 +359,8 @@ if (!writer_impl) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create an XML writer wrapper"); return NULL; } writer_impl->xml_writer = xmlNewTextWriterFilename(filename, compression); @@ -366,7 +368,7 @@ if (!(writer_impl->xml_writer)) { AXIS2_FREE(env->allocator, writer_impl); - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_CREATING_XML_STREAM_WRITER, AXIS2_FAILURE); return NULL; } @@ -396,6 +398,8 @@ { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create URI prefix hash map"); return NULL; } writer_impl->writer.ops = &axiom_xml_writer_ops_var; @@ -419,6 +423,8 @@ if (!writer_impl) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create writer wrapper"); return NULL; } @@ -440,6 +446,8 @@ { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create a buffer for writer wrapper"); return NULL; } @@ -454,7 +462,7 @@ else { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE, AXIS2_FAILURE); return NULL; } @@ -462,7 +470,7 @@ if (!(writer_impl->xml_writer)) { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_WRITER, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_CREATING_XML_STREAM_WRITER, AXIS2_FAILURE); return NULL; } @@ -481,6 +489,8 @@ { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create URI prefix hash map"); return NULL; } writer_impl->stack = axutil_stack_create(env); @@ -488,6 +498,8 @@ { axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env); AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create the stack for writer wrapper"); return NULL; } @@ -560,7 +572,7 @@ (xmlChar *) localname); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_START_ELEMENT, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -598,7 +610,7 @@ if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -629,7 +641,7 @@ BAD_CAST localname, BAD_CAST NULL); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -655,14 +667,14 @@ if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } status = xmlTextWriterEndElement(writer_impl->xml_writer); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -690,7 +702,7 @@ if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -698,7 +710,7 @@ status = xmlTextWriterEndElement(writer_impl->xml_writer); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -729,7 +741,7 @@ BAD_CAST localname, BAD_CAST NULL); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -737,7 +749,7 @@ status = xmlTextWriterEndElement(writer_impl->xml_writer); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -765,7 +777,7 @@ status = xmlTextWriterEndElement(writer_impl->xml_writer); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_END_ELEMENT, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_END_ELEMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -785,7 +797,7 @@ status = xmlTextWriterEndDocument(writer_impl->xml_writer); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_END_DOCUMENT, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_END_DOCUMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -813,7 +825,7 @@ BAD_CAST localname, BAD_CAST value); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_ATTRIBUTE, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -845,7 +857,7 @@ BAD_CAST NULL, BAD_CAST value); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -879,7 +891,7 @@ BAD_CAST NULL, BAD_CAST value); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -925,7 +937,7 @@ if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -961,7 +973,7 @@ } if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_DEFAULT_NAMESPACE, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DEFAULT_NAMESPACE, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -983,7 +995,7 @@ status = xmlTextWriterWriteComment(writer_impl->xml_writer, BAD_CAST value); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_COMMENT, AXIS2_FAILURE); + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_COMMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } return AXIS2_SUCCESS; @@ -1004,7 +1016,7 @@ status = xmlTextWriterStartPI(writer_impl->xml_writer, BAD_CAST target); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -1030,7 +1042,7 @@ BAD_CAST target, BAD_CAST data); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION, AXIS2_FAILURE); return AXIS2_FAILURE; @@ -1054,7 +1066,7 @@ status = xmlTextWriterWriteCDATA(writer_impl->xml_writer, BAD_CAST data); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_CDATA, AXIS2_FAILURE); + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_CDATA, AXIS2_FAILURE); return AXIS2_FAILURE; } return AXIS2_SUCCESS; @@ -1075,7 +1087,7 @@ BAD_CAST dtd, NULL, NULL); if (status < 0) { - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_DTD, AXIS2_FAILURE); + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DTD, AXIS2_FAILURE); return AXIS2_FAILURE; } return AXIS2_SUCCESS; @@ -1106,7 +1118,7 @@ NULL, NULL, NULL); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -1129,7 +1141,7 @@ version, NULL, NULL); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -1152,7 +1164,7 @@ version, encoding, NULL); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -1176,7 +1188,7 @@ status = xmlTextWriterWriteString(writer_impl->xml_writer, BAD_CAST text); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE); return AXIS2_FAILURE; } @@ -1459,6 +1471,8 @@ if (!up_element) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, + "No memory. Cannot create URI prefix element %s", uri); return NULL; } up_element->key = NULL; @@ -1594,7 +1608,7 @@ status = xmlTextWriterWriteRaw(writer_impl->xml_writer, BAD_CAST content); if (status < 0) { - AXIS2_ERROR_SET(env->error, + AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DATA_SOURCE, AXIS2_FAILURE); return AXIS2_FAILURE; } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org