Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 40236 invoked from network); 24 Oct 2005 05:35:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Oct 2005 05:35:39 -0000 Received: (qmail 97709 invoked by uid 500); 24 Oct 2005 05:35:39 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 97465 invoked by uid 500); 24 Oct 2005 05:35:38 -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 97454 invoked by uid 500); 24 Oct 2005 05:35:38 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 97451 invoked by uid 99); 24 Oct 2005 05:35:38 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 23 Oct 2005 22:35:37 -0700 Received: (qmail 40020 invoked by uid 65534); 24 Oct 2005 05:35:17 -0000 Message-ID: <20051024053516.40019.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r327977 - in /webservices/axis2/trunk/c: include/axis2_om_text.h modules/xml/om/src/axis2_om_stax_builder.c modules/xml/om/src/axis2_om_text.c Date: Mon, 24 Oct 2005 05:35:14 -0000 To: axis2-cvs@ws.apache.org From: samisa@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: samisa Date: Sun Oct 23 22:34:51 2005 New Revision: 327977 URL: http://svn.apache.org/viewcvs?rev=327977&view=rev Log: Added doc comments stuff. Fixed calling convention. Modified: webservices/axis2/trunk/c/include/axis2_om_text.h webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Modified: webservices/axis2/trunk/c/include/axis2_om_text.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=327977&r1=327976&r2=327977&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_om_text.h (original) +++ webservices/axis2/trunk/c/include/axis2_om_text.h Sun Oct 23 22:34:51 2005 @@ -52,7 +52,7 @@ * @param om_text pointer to om text struct to be freed * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE */ - AXIS2_DECLARE(axis2_status_t) (*axis2_om_text_ops_free) (axis2_environment_t * + AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_text_ops_free) (axis2_environment_t * environment, struct axis2_om_text * om_text); @@ -64,7 +64,7 @@ * @param om_output OM output handler to be used in serializing * @return satus of the operation. AXIS2_SUCCESS on success else AXIS2_FAILURE */ - AXIS2_DECLARE(axis2_status_t) (*axis2_om_text_ops_serialize) (axis2_environment_t * + AXIS2_DECLARE_DATA axis2_status_t (AXIS2_CALL *axis2_om_text_ops_serialize) (axis2_environment_t * environment, const struct axis2_om_text * @@ -73,10 +73,10 @@ om_output); } axis2_om_text_ops_t; -/** - \brief OM Text struct - Handles the XML text in OM -*/ + /** + * \brief OM Text struct + * Handles the XML text in OM + */ typedef struct axis2_om_text { /** OM text related operations */ @@ -98,8 +98,10 @@ * @param environment Environment. MUST NOT be NULL, if NULL behaviour is undefined. * @param parent parent of the new node. Optinal, can be NULL. * The parent element must be of type AXIS2_OM_ELEMENT - * @param value Text value - * @param node Out parameter to store the newly created node + * @param value Text value. Optinal, can be NULL. + * @param comment_node This is an out parameter. Mandatory, cannot be NULL. + * Returns the node corresponding to the text struct created. + * Node type will be set to AXIS2_OM_TEXT * @return pointer to newly created text struct */ AXIS2_DECLARE(axis2_om_text_t *) axis2_om_text_create (axis2_environment_t * environment, @@ -107,7 +109,9 @@ const axis2_char_t * value, axis2_om_node_t ** node); +/** serializes given text */ #define axis2_om_text_serialize(environment, om_text, om_output) ((om_text)->ops->axis2_om_text_ops_serialize(environment, om_text, om_output)) +/** frees given text */ #define axis2_om_text_free(environment, om_text) ((om_text)->ops->axis2_om_text_ops_free(environment, om_text)) /** @} */ Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c?rev=327977&r1=327976&r2=327977&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c (original) +++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c Sun Oct 23 22:34:51 2005 @@ -22,12 +22,12 @@ const axis2_char_t XMLNS_URI[] = "http://www.w3.org/XML/1998/namespace"; const axis2_char_t XMLNS_PREFIX[] = "xml"; -axis2_om_node_t *axis2_om_stax_builder_impl_next (axis2_environment_t * +axis2_om_node_t * AXIS2_CALL axis2_om_stax_builder_impl_next (axis2_environment_t * environment, axis2_om_stax_builder_t * builder); axis2_status_t -axis2_om_stax_builder_impl_discard_current_element (axis2_environment_t * +AXIS2_CALL axis2_om_stax_builder_impl_discard_current_element (axis2_environment_t * environment, axis2_om_stax_builder_t * builder); @@ -198,10 +198,7 @@ value = axis2_strdup (environment->string, temp_value); axis2_free (environment->allocator, temp_value); /*should use guththila free here */ } - /* Parser should fire a SPACE event here - if(!isnot_whitespace(value)) - return NULL; - */ + if (builder->lastnode->done) { axis2_om_text_create (environment, builder->lastnode->parent, value, Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c?rev=327977&r1=327976&r2=327977&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c (original) +++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Sun Oct 23 22:34:51 2005 @@ -23,9 +23,9 @@ */ /* operations */ -axis2_status_t axis2_om_text_impl_free (axis2_environment_t * environment, +axis2_status_t AXIS2_CALL axis2_om_text_impl_free (axis2_environment_t * environment, axis2_om_text_t * om_text); -axis2_status_t axis2_om_text_impl_serialize (axis2_environment_t * +axis2_status_t AXIS2_CALL axis2_om_text_impl_serialize (axis2_environment_t * environment, const axis2_om_text_t * om_text, axis2_om_output_t * om_output);