You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/06/12 10:23:02 UTC
svn commit: r413605 [6/10] - in /webservices/axis2/trunk/c/axiom: include/
src/attachments/ src/om/ src/soap/ src/util/ test/om/ test/soap/ test/unit/
test/unit/om/
Modified: webservices/axis2/trunk/c/axiom/src/om/om_navigator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_navigator.c?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_navigator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_navigator.c Mon Jun 12 01:22:58 2006
@@ -14,45 +14,45 @@
* limitations under the License.
*/
-#include <axis2_om_navigator.h>
+#include <axiom_navigator.h>
/*************************** function prototypes ******************************************/
axis2_status_t AXIS2_CALL
-axis2_om_navigator_free(axis2_om_navigator_t *om__navigator,
+axiom_navigator_free(axiom_navigator_t *om__navigator,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_navigator_is_navigable(axis2_om_navigator_t *om_navigator,
+axiom_navigator_is_navigable(axiom_navigator_t *om_navigator,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_navigator_is_completed(axis2_om_navigator_t *om_navigator,
+axiom_navigator_is_completed(axiom_navigator_t *om_navigator,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_navigator_visited(axis2_om_navigator_t *om_navigator,
+axiom_navigator_visited(axiom_navigator_t *om_navigator,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_navigator_next(axis2_om_navigator_t *om_navigator,
+axiom_node_t* AXIS2_CALL
+axiom_navigator_next(axiom_navigator_t *om_navigator,
const axis2_env_t *env);
static void
-axis2_om_navigator_update_next_node(axis2_om_navigator_t *om_navigator,
+axiom_navigator_update_next_node(axiom_navigator_t *om_navigator,
const axis2_env_t *env);
/************************************************************************************/
-typedef struct axis2_om_navigator_impl
+typedef struct axiom_navigator_impl
{
- axis2_om_navigator_t navigator;
+ axiom_navigator_t navigator;
- axis2_om_node_t *node;
+ axiom_node_t *node;
axis2_bool_t visited;
- axis2_om_node_t *next;
+ axiom_node_t *next;
- axis2_om_node_t *root;
+ axiom_node_t *root;
axis2_bool_t backtracked;
@@ -60,25 +60,25 @@
axis2_bool_t start;
-}axis2_om_navigator_impl_t;
+}axiom_navigator_impl_t;
/****************************** Macro ***************************************/
-#define AXIS2_INTF_TO_IMPL(navigator) ((axis2_om_navigator_impl_t *)navigator)
+#define AXIS2_INTF_TO_IMPL(navigator) ((axiom_navigator_impl_t *)navigator)
/*****************************************************************************/
-AXIS2_EXTERN axis2_om_navigator_t * AXIS2_CALL
-axis2_om_navigator_create(const axis2_env_t *env,
- axis2_om_node_t *om_node)
+AXIS2_EXTERN axiom_navigator_t * AXIS2_CALL
+axiom_navigator_create(const axis2_env_t *env,
+ axiom_node_t *om_node)
{
- axis2_om_navigator_impl_t *navigator_impl = NULL;
+ axiom_navigator_impl_t *navigator_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- navigator_impl = (axis2_om_navigator_impl_t *)
- AXIS2_MALLOC(env->allocator, sizeof(axis2_om_navigator_impl_t));
+ navigator_impl = (axiom_navigator_impl_t *)
+ AXIS2_MALLOC(env->allocator, sizeof(axiom_navigator_impl_t));
if(!navigator_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -96,8 +96,8 @@
navigator_impl->next = om_node;
navigator_impl->root = om_node;
- navigator_impl->navigator.ops = (axis2_om_navigator_ops_t*)AXIS2_MALLOC(
- env->allocator, sizeof(axis2_om_navigator_ops_t));
+ navigator_impl->navigator.ops = (axiom_navigator_ops_t*)AXIS2_MALLOC(
+ env->allocator, sizeof(axiom_navigator_ops_t));
if(!(navigator_impl->navigator.ops))
{
@@ -108,26 +108,26 @@
};
navigator_impl->navigator.ops->free =
- axis2_om_navigator_free;
+ axiom_navigator_free;
navigator_impl->navigator.ops->is_navigable =
- axis2_om_navigator_is_navigable;
+ axiom_navigator_is_navigable;
navigator_impl->navigator.ops->is_completed =
- axis2_om_navigator_is_completed;
+ axiom_navigator_is_completed;
navigator_impl->navigator.ops->visited =
- axis2_om_navigator_visited;
+ axiom_navigator_visited;
navigator_impl->navigator.ops->next =
- axis2_om_navigator_next;
+ axiom_navigator_next;
return &(navigator_impl->navigator);
}
axis2_status_t AXIS2_CALL
-axis2_om_navigator_free(axis2_om_navigator_t *om_navigator,
+axiom_navigator_free(axiom_navigator_t *om_navigator,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env , AXIS2_FAILURE);
@@ -144,10 +144,10 @@
}
axis2_bool_t AXIS2_CALL
-axis2_om_navigator_is_navigable(axis2_om_navigator_t *om_navigator,
+axiom_navigator_is_navigable(axiom_navigator_t *om_navigator,
const axis2_env_t *env)
{
- axis2_om_navigator_impl_t *navigator_impl = NULL;
+ axiom_navigator_impl_t *navigator_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
navigator_impl = AXIS2_INTF_TO_IMPL(om_navigator);
@@ -163,7 +163,7 @@
axis2_bool_t AXIS2_CALL
-axis2_om_navigator_is_completed(axis2_om_navigator_t *om_navigator,
+axiom_navigator_is_completed(axiom_navigator_t *om_navigator,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -172,7 +172,7 @@
axis2_bool_t AXIS2_CALL
-axis2_om_navigator_visited(axis2_om_navigator_t *om_navigator,
+axiom_navigator_visited(axiom_navigator_t *om_navigator,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -180,11 +180,11 @@
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_navigator_next(axis2_om_navigator_t *om_navigator,
+axiom_node_t* AXIS2_CALL
+axiom_navigator_next(axiom_navigator_t *om_navigator,
const axis2_env_t *env)
{
- axis2_om_navigator_impl_t *navigator_impl = NULL;
+ axiom_navigator_impl_t *navigator_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
navigator_impl = AXIS2_INTF_TO_IMPL(om_navigator);
@@ -196,7 +196,7 @@
navigator_impl->visited = navigator_impl->backtracked;
navigator_impl->backtracked = AXIS2_FALSE;
- axis2_om_navigator_update_next_node(om_navigator, env);
+ axiom_navigator_update_next_node(om_navigator, env);
/** set the starting and ending flags */
@@ -215,10 +215,10 @@
}
/** this method encapsulate searching logic */
static void
-axis2_om_navigator_update_next_node(axis2_om_navigator_t *om_navigator,
+axiom_navigator_update_next_node(axiom_navigator_t *om_navigator,
const axis2_env_t *env)
{
- axis2_om_navigator_impl_t *navigator_impl = NULL;
+ axiom_navigator_impl_t *navigator_impl = NULL;
if(!om_navigator)
return;
@@ -227,14 +227,14 @@
if(!navigator_impl->next)
return;
- if((AXIS2_OM_ELEMENT == AXIS2_OM_NODE_GET_NODE_TYPE(navigator_impl->next, env)) &&
+ if((AXIOM_ELEMENT == AXIOM_NODE_GET_NODE_TYPE(navigator_impl->next, env)) &&
!(navigator_impl->visited))
{
- if(NULL != AXIS2_OM_NODE_GET_FIRST_CHILD(navigator_impl->next, env))
+ if(NULL != AXIOM_NODE_GET_FIRST_CHILD(navigator_impl->next, env))
{
- navigator_impl->next = AXIS2_OM_NODE_GET_FIRST_CHILD(navigator_impl->next, env);
+ navigator_impl->next = AXIOM_NODE_GET_FIRST_CHILD(navigator_impl->next, env);
}
- else if(AXIS2_TRUE == AXIS2_OM_NODE_IS_COMPLETE(navigator_impl->next, env))
+ else if(AXIS2_TRUE == AXIOM_NODE_IS_COMPLETE(navigator_impl->next, env))
{
navigator_impl->backtracked = AXIS2_TRUE;
}
@@ -245,18 +245,18 @@
}
else
{
- axis2_om_node_t *parent = NULL;
- axis2_om_node_t *next_sibling = NULL;
+ axiom_node_t *parent = NULL;
+ axiom_node_t *next_sibling = NULL;
- next_sibling = AXIS2_OM_NODE_GET_NEXT_SIBLING(navigator_impl->next, env);
+ next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(navigator_impl->next, env);
- parent = AXIS2_OM_NODE_GET_PARENT(navigator_impl->next, env);
+ parent = AXIOM_NODE_GET_PARENT(navigator_impl->next, env);
if(NULL != next_sibling)
{
navigator_impl->next = next_sibling;
}
- else if((NULL != parent) && AXIS2_OM_NODE_IS_COMPLETE(parent, env))
+ else if((NULL != parent) && AXIOM_NODE_IS_COMPLETE(parent, env))
{
navigator_impl->next = parent;
navigator_impl->backtracked = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Mon Jun 12 01:22:58 2006
@@ -14,143 +14,143 @@
* limitations under the License.
*/
-#include "axis2_om_node_internal.h"
-#include <axis2_om_element.h>
-#include <axis2_om_text.h>
-#include <axis2_om_comment.h>
-#include <axis2_om_processing_instruction.h>
-#include <axis2_om_doctype.h>
-#include <axis2_om_document.h>
-#include <axis2_om_stax_builder.h>
+#include "axiom_node_internal.h"
+#include <axiom_element.h>
+#include <axiom_text.h>
+#include <axiom_comment.h>
+#include <axiom_processing_instruction.h>
+#include <axiom_doctype.h>
+#include <axiom_document.h>
+#include <axiom_stax_builder.h>
/*************************** function prototypes ******************************************/
axis2_status_t AXIS2_CALL
-axis2_om_node_free_tree (axis2_om_node_t * om_node,
+axiom_node_free_tree (axiom_node_t * om_node,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_node_add_child (axis2_om_node_t *om_node,
+axiom_node_add_child (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t * child);
+ axiom_node_t * child);
-axis2_om_node_t * AXIS2_CALL
-axis2_om_node_detach (axis2_om_node_t *om_node,
+axiom_node_t * AXIS2_CALL
+axiom_node_detach (axiom_node_t *om_node,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_node_insert_sibling_after (axis2_om_node_t *om_node,
+axiom_node_insert_sibling_after (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *node_to_insert);
+ axiom_node_t *node_to_insert);
axis2_status_t AXIS2_CALL
-axis2_om_node_insert_sibling_before (axis2_om_node_t *om_node,
+axiom_node_insert_sibling_before (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *node_to_insert);
+ axiom_node_t *node_to_insert);
axis2_status_t AXIS2_CALL
-axis2_om_node_serialize (axis2_om_node_t * om_node,
+axiom_node_serialize (axiom_node_t * om_node,
const axis2_env_t *env,
- axis2_om_output_t * om_output);
+ axiom_output_t * om_output);
axis2_char_t * AXIS2_CALL
-axis2_om_node_to_string(axis2_om_node_t *om_node,
+axiom_node_to_string(axiom_node_t *om_node,
const axis2_env_t *env);
/****************************** accessor mutator *********************************************/
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_parent(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_parent(axiom_node_t *om_node,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_first_child(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_first_child(axiom_node_t *om_node,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_last_child(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_last_child(axiom_node_t *om_node,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_previous_sibling(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_previous_sibling(axiom_node_t *om_node,
const axis2_env_t *env);
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_next_sibling(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_next_sibling(axiom_node_t *om_node,
const axis2_env_t *env);
-axis2_om_types_t AXIS2_CALL
-axis2_om_node_get_node_type(axis2_om_node_t *om_node,
+axiom_types_t AXIS2_CALL
+axiom_node_get_node_type(axiom_node_t *om_node,
const axis2_env_t *env);
void* AXIS2_CALL
-axis2_om_node_get_data_element(axis2_om_node_t *om_node,
+axiom_node_get_data_element(axiom_node_t *om_node,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_node_is_complete(axis2_om_node_t *om_node,
+axiom_node_is_complete(axiom_node_t *om_node,
const axis2_env_t *env);
-struct axis2_om_document* AXIS2_CALL
-axis2_om_node_get_document(axis2_om_node_t *om_node,
+struct axiom_document* AXIS2_CALL
+axiom_node_get_document(axiom_node_t *om_node,
const axis2_env_t *env);
/************************************************************************************/
-typedef struct axis2_om_node_impl
+typedef struct axiom_node_impl
{
- axis2_om_node_t om_node;
+ axiom_node_t om_node;
/** document only availble if build through builder */
- struct axis2_om_document *om_doc;
+ struct axiom_document *om_doc;
- axis2_om_stax_builder_t *builder;
+ axiom_stax_builder_t *builder;
/** parent node */
- axis2_om_node_t *parent;
+ axiom_node_t *parent;
/** previous sibling */
- axis2_om_node_t *prev_sibling;
+ axiom_node_t *prev_sibling;
/** next sibling */
- axis2_om_node_t *next_sibling;
+ axiom_node_t *next_sibling;
/** first child */
- axis2_om_node_t *first_child;
+ axiom_node_t *first_child;
/** last child */
- axis2_om_node_t *last_child;
+ axiom_node_t *last_child;
/** node type, indicates the type stored in data_element */
- axis2_om_types_t node_type;
+ axiom_types_t node_type;
/** done true means that this node is completely built , false otherwise */
int done;
/** instances of an om struct, whose type is defined by node type */
void *data_element;
-}axis2_om_node_impl_t;
+}axiom_node_impl_t;
/****************************** Macro ***************************************/
-#define AXIS2_INTF_TO_IMPL(node) ((axis2_om_node_impl_t *)node)
+#define AXIS2_INTF_TO_IMPL(node) ((axiom_node_impl_t *)node)
/*****************************************************************************/
-AXIS2_EXTERN axis2_om_node_t * AXIS2_CALL
-axis2_om_node_create (const axis2_env_t *env)
+AXIS2_EXTERN axiom_node_t * AXIS2_CALL
+axiom_node_create (const axis2_env_t *env)
{
- axis2_om_node_impl_t *node = NULL;
+ axiom_node_impl_t *node = NULL;
AXIS2_ENV_CHECK(env,NULL);
- node = (axis2_om_node_impl_t *) AXIS2_MALLOC (env->allocator,
- sizeof (axis2_om_node_impl_t));
+ node = (axiom_node_impl_t *) AXIS2_MALLOC (env->allocator,
+ sizeof (axiom_node_impl_t));
if (!node)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
- node->om_node.ops = (axis2_om_node_ops_t *) AXIS2_MALLOC
- (env->allocator,sizeof (axis2_om_node_ops_t));
+ node->om_node.ops = (axiom_node_ops_t *) AXIS2_MALLOC
+ (env->allocator,sizeof (axiom_node_ops_t));
if (!(node->om_node.ops))
{
@@ -164,30 +164,30 @@
node->next_sibling = NULL;
node->prev_sibling = NULL;
node->parent = NULL;
- node->node_type = AXIS2_OM_INVALID;
+ node->node_type = AXIOM_INVALID;
node->done = AXIS2_FALSE;
node->data_element = NULL;
node->om_doc = NULL;
node->builder = NULL;
/* assign fucn pointers */
- node->om_node.ops->add_child = axis2_om_node_add_child;
- node->om_node.ops->free = axis2_om_node_free_tree;
- node->om_node.ops->detach = axis2_om_node_detach;
- node->om_node.ops->to_string = axis2_om_node_to_string;
- node->om_node.ops->insert_sibling_after = axis2_om_node_insert_sibling_after;
- node->om_node.ops->insert_sibling_before = axis2_om_node_insert_sibling_before;
- node->om_node.ops->serialize = axis2_om_node_serialize;
-
- node->om_node.ops->get_first_child = axis2_om_node_get_first_child;
- node->om_node.ops->get_last_child = axis2_om_node_get_last_child;
- node->om_node.ops->get_next_sibling = axis2_om_node_get_next_sibling;
- node->om_node.ops->get_previous_sibling = axis2_om_node_get_previous_sibling;
- node->om_node.ops->get_parent = axis2_om_node_get_parent ;
- node->om_node.ops->get_node_type = axis2_om_node_get_node_type;
- node->om_node.ops->is_complete = axis2_om_node_is_complete;
- node->om_node.ops->get_data_element = axis2_om_node_get_data_element;
- node->om_node.ops->get_document = axis2_om_node_get_document;
+ node->om_node.ops->add_child = axiom_node_add_child;
+ node->om_node.ops->free = axiom_node_free_tree;
+ node->om_node.ops->detach = axiom_node_detach;
+ node->om_node.ops->to_string = axiom_node_to_string;
+ node->om_node.ops->insert_sibling_after = axiom_node_insert_sibling_after;
+ node->om_node.ops->insert_sibling_before = axiom_node_insert_sibling_before;
+ node->om_node.ops->serialize = axiom_node_serialize;
+
+ node->om_node.ops->get_first_child = axiom_node_get_first_child;
+ node->om_node.ops->get_last_child = axiom_node_get_last_child;
+ node->om_node.ops->get_next_sibling = axiom_node_get_next_sibling;
+ node->om_node.ops->get_previous_sibling = axiom_node_get_previous_sibling;
+ node->om_node.ops->get_parent = axiom_node_get_parent ;
+ node->om_node.ops->get_node_type = axiom_node_get_node_type;
+ node->om_node.ops->is_complete = axiom_node_is_complete;
+ node->om_node.ops->get_data_element = axiom_node_get_data_element;
+ node->om_node.ops->get_document = axiom_node_get_document;
return &(node->om_node);
}
@@ -198,11 +198,11 @@
*/
axis2_status_t AXIS2_CALL
-axis2_om_node_free_tree(axis2_om_node_t *om_node,
+axiom_node_free_tree(axiom_node_t *om_node,
const axis2_env_t *env)
{
- axis2_om_node_impl_t *node_impl = NULL;
- axis2_om_node_t *child_node = NULL;
+ axiom_node_impl_t *node_impl = NULL;
+ axiom_node_t *child_node = NULL;
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
if(!om_node)
return AXIS2_FAILURE;
@@ -213,10 +213,10 @@
{
while (NULL != (node_impl->first_child))
{
- child_node = AXIS2_OM_NODE_DETACH (node_impl->first_child, env);
+ child_node = AXIOM_NODE_DETACH (node_impl->first_child, env);
if (NULL != child_node)
{
- AXIS2_OM_NODE_FREE_TREE ( child_node , env);
+ AXIOM_NODE_FREE_TREE ( child_node , env);
child_node = NULL;
}
}
@@ -224,29 +224,29 @@
switch (node_impl->node_type)
{
- case AXIS2_OM_ELEMENT:
+ case AXIOM_ELEMENT:
if(NULL != node_impl->data_element)
- AXIS2_OM_ELEMENT_FREE((axis2_om_element_t*)(node_impl->data_element), env);
+ AXIOM_ELEMENT_FREE((axiom_element_t*)(node_impl->data_element), env);
break;
- case AXIS2_OM_COMMENT:
+ case AXIOM_COMMENT:
if(NULL != node_impl->data_element)
- AXIS2_OM_COMMENT_FREE((axis2_om_comment_t*)(node_impl->data_element), env);
+ AXIOM_COMMENT_FREE((axiom_comment_t*)(node_impl->data_element), env);
break;
- case AXIS2_OM_DOCTYPE:
- /*AXIS2_OM_DOCTYPE_FREE((axis2_om_doctype_t*)(node_impl->data_element), env);*/
+ case AXIOM_DOCTYPE:
+ /*AXIOM_DOCTYPE_FREE((axiom_doctype_t*)(node_impl->data_element), env);*/
break;
- case AXIS2_OM_PROCESSING_INSTRUCTION:
+ case AXIOM_PROCESSING_INSTRUCTION:
if(NULL != node_impl->data_element)
- AXIS2_OM_PROCESSING_INSTRUCTION_FREE(
- (axis2_om_processing_instruction_t*)(node_impl->data_element), env);
+ AXIOM_PROCESSING_INSTRUCTION_FREE(
+ (axiom_processing_instruction_t*)(node_impl->data_element), env);
break;
- case AXIS2_OM_TEXT:
+ case AXIOM_TEXT:
if(NULL != node_impl->data_element)
- AXIS2_OM_TEXT_FREE((axis2_om_text_t*)(node_impl->data_element),env);
+ AXIOM_TEXT_FREE((axiom_text_t*)(node_impl->data_element),env);
break;
@@ -264,9 +264,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_node_add_child (axis2_om_node_t *om_node,
+axiom_node_add_child (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *child)
+ axiom_node_t *child)
{
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, child, AXIS2_FAILURE);
@@ -274,7 +274,7 @@
if(AXIS2_INTF_TO_IMPL(child)->parent)
{
- child = AXIS2_OM_NODE_DETACH(child, env);
+ child = AXIOM_NODE_DETACH(child, env);
}
if (AXIS2_INTF_TO_IMPL(om_node)->first_child == NULL)
@@ -283,7 +283,7 @@
}
else
{
- axis2_om_node_t *last_sib = NULL;
+ axiom_node_t *last_sib = NULL;
last_sib = AXIS2_INTF_TO_IMPL(om_node)->last_child;
if(last_sib)
{
@@ -297,11 +297,11 @@
return AXIS2_SUCCESS;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_detach (axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_detach (axiom_node_t *om_node,
const axis2_env_t *env)
{
- axis2_om_node_t *parent = NULL;
+ axiom_node_t *parent = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -317,7 +317,7 @@
}
else
{
- axis2_om_node_t *prev_sib = NULL;
+ axiom_node_t *prev_sib = NULL;
prev_sib = AXIS2_INTF_TO_IMPL(om_node)->prev_sibling;
if(prev_sib)
{ AXIS2_INTF_TO_IMPL(prev_sib)->next_sibling =
@@ -327,7 +327,7 @@
if (AXIS2_INTF_TO_IMPL(om_node)->next_sibling)
{
- axis2_om_node_t *next_sibling = NULL;
+ axiom_node_t *next_sibling = NULL;
next_sibling = AXIS2_INTF_TO_IMPL(om_node)->next_sibling;
if(next_sibling)
AXIS2_INTF_TO_IMPL(next_sibling)->prev_sibling =
@@ -353,11 +353,11 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_parent (axis2_om_node_t *om_node,
+axiom_node_set_parent (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t * parent)
+ axiom_node_t * parent)
{
- axis2_om_node_impl_t *node_impl = NULL;
+ axiom_node_impl_t *node_impl = NULL;
AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
if(!om_node)
return AXIS2_FAILURE;
@@ -376,7 +376,7 @@
*/
if(NULL != node_impl->parent)
{
- om_node = axis2_om_node_detach(om_node, env);
+ om_node = axiom_node_detach(om_node, env);
}
node_impl->parent = parent;
@@ -392,11 +392,11 @@
*/
axis2_status_t AXIS2_CALL
-axis2_om_node_insert_sibling_after (axis2_om_node_t * om_node,
+axiom_node_insert_sibling_after (axiom_node_t * om_node,
const axis2_env_t *env,
- axis2_om_node_t * node_to_insert)
+ axiom_node_t * node_to_insert)
{
- axis2_om_node_t *next_sib = NULL;
+ axiom_node_t *next_sib = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -422,11 +422,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_node_insert_sibling_before (axis2_om_node_t *om_node,
+axiom_node_insert_sibling_before (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t * node_to_insert)
+ axiom_node_t * node_to_insert)
{
- axis2_om_node_t *prev_sibling = NULL;
+ axiom_node_t *prev_sibling = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node_to_insert, AXIS2_FAILURE);
@@ -443,12 +443,12 @@
if (!prev_sibling)
{
- axis2_om_node_t *parent = AXIS2_INTF_TO_IMPL(om_node)->parent;
+ axiom_node_t *parent = AXIS2_INTF_TO_IMPL(om_node)->parent;
AXIS2_INTF_TO_IMPL(parent)->first_child = node_to_insert;
}
else
{
- axis2_om_node_t *prev_sibling = AXIS2_INTF_TO_IMPL(om_node)->prev_sibling;
+ axiom_node_t *prev_sibling = AXIS2_INTF_TO_IMPL(om_node)->prev_sibling;
if(prev_sibling)
AXIS2_INTF_TO_IMPL(prev_sibling)->next_sibling = node_to_insert;
}
@@ -457,14 +457,14 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_node_serialize (axis2_om_node_t *om_node,
+axiom_node_serialize (axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_output_t *om_output)
+ axiom_output_t *om_output)
{
int status = AXIS2_SUCCESS;
- axis2_om_node_impl_t *node_impl = NULL;
- axis2_om_node_t *temp_node = NULL;
+ axiom_node_impl_t *node_impl = NULL;
+ axiom_node_t *temp_node = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -478,11 +478,11 @@
switch (node_impl->node_type)
{
- case AXIS2_OM_ELEMENT:
+ case AXIOM_ELEMENT:
if(NULL != node_impl->data_element)
{
- status = AXIS2_OM_ELEMENT_SERIALIZE_START_PART(
- (axis2_om_element_t *)(node_impl->data_element),
+ status = AXIOM_ELEMENT_SERIALIZE_START_PART(
+ (axiom_element_t *)(node_impl->data_element),
env,
om_output,
om_node);
@@ -492,11 +492,11 @@
break;
- case AXIS2_OM_TEXT:
+ case AXIOM_TEXT:
if(NULL != node_impl->data_element)
{
- status = AXIS2_OM_TEXT_SERIALIZE (
- (axis2_om_text_t*)(node_impl->data_element),
+ status = AXIOM_TEXT_SERIALIZE (
+ (axiom_text_t*)(node_impl->data_element),
env, om_output);
}
if(status != AXIS2_SUCCESS)
@@ -504,11 +504,11 @@
break;
- case AXIS2_OM_COMMENT:
+ case AXIOM_COMMENT:
if(NULL != node_impl->data_element)
{
- status = AXIS2_OM_COMMENT_SERIALIZE(
- (axis2_om_comment_t*)(node_impl->data_element),
+ status = AXIOM_COMMENT_SERIALIZE(
+ (axiom_comment_t*)(node_impl->data_element),
env, om_output);
}
if( status != AXIS2_SUCCESS)
@@ -516,11 +516,11 @@
break;
- case AXIS2_OM_DOCTYPE:
+ case AXIOM_DOCTYPE:
if(NULL != node_impl->data_element)
{
- status = AXIS2_OM_DOCTYPE_SERIALIZE(
- (axis2_om_doctype_t*)(node_impl->data_element),
+ status = AXIOM_DOCTYPE_SERIALIZE(
+ (axiom_doctype_t*)(node_impl->data_element),
env, om_output);
}
if( status != AXIS2_SUCCESS)
@@ -528,11 +528,11 @@
break;
- case AXIS2_OM_PROCESSING_INSTRUCTION:
+ case AXIOM_PROCESSING_INSTRUCTION:
if(NULL != node_impl->data_element)
{
- status = AXIS2_OM_PROCESSING_INSTRUCTION_SERIALIZE(
- (axis2_om_processing_instruction_t*)(node_impl->data_element),
+ status = AXIOM_PROCESSING_INSTRUCTION_SERIALIZE(
+ (axiom_processing_instruction_t*)(node_impl->data_element),
env, om_output);
}
@@ -545,21 +545,21 @@
}
- temp_node = axis2_om_node_get_first_child(om_node, env);
+ temp_node = axiom_node_get_first_child(om_node, env);
/* serialize children of this node */
while(NULL != temp_node)
{
- status = axis2_om_node_serialize(temp_node, env, om_output);
- temp_node = AXIS2_OM_NODE_GET_NEXT_SIBLING(temp_node, env);
+ status = axiom_node_serialize(temp_node, env, om_output);
+ temp_node = AXIOM_NODE_GET_NEXT_SIBLING(temp_node, env);
}
switch (node_impl->node_type)
{
- case AXIS2_OM_ELEMENT:
+ case AXIOM_ELEMENT:
if(NULL != node_impl->data_element)
{
- status = AXIS2_OM_ELEMENT_SERIALIZE_END_PART (
- (axis2_om_element_t *)(node_impl->data_element),
+ status = AXIOM_ELEMENT_SERIALIZE_END_PART (
+ (axiom_element_t *)(node_impl->data_element),
env, om_output);
}
if (status != AXIS2_SUCCESS)
@@ -574,19 +574,19 @@
return status;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_parent(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_parent(axiom_node_t *om_node,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->parent;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_first_child(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_first_child(axiom_node_t *om_node,
const axis2_env_t *env)
{
- axis2_om_node_impl_t *om_node_impl = NULL;
+ axiom_node_impl_t *om_node_impl = NULL;
int token = 0;
if(! om_node)
return NULL;
@@ -597,7 +597,7 @@
while(!(om_node_impl->first_child) && !(om_node_impl->done)
&& om_node_impl->builder)
{
- token = AXIS2_OM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node_impl->builder, env);
+ token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node_impl->builder, env);
if(token == -1)
return NULL;
}
@@ -605,8 +605,8 @@
return om_node_impl->first_child;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_last_child(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_last_child(axiom_node_t *om_node,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -614,19 +614,19 @@
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_previous_sibling(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_previous_sibling(axiom_node_t *om_node,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_node)->prev_sibling;
}
-axis2_om_node_t* AXIS2_CALL
-axis2_om_node_get_next_sibling(axis2_om_node_t *om_node,
+axiom_node_t* AXIS2_CALL
+axiom_node_get_next_sibling(axiom_node_t *om_node,
const axis2_env_t *env)
{
- axis2_om_node_impl_t *om_node_impl = NULL;
+ axiom_node_impl_t *om_node_impl = NULL;
int token = 0;
if(!om_node)
@@ -636,9 +636,9 @@
om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
/*****************************************************/
while(!(om_node_impl->next_sibling) && om_node_impl->parent &&
- om_node_impl->builder && !(AXIS2_OM_NODE_IS_COMPLETE(om_node_impl->parent, env)))
+ om_node_impl->builder && !(AXIOM_NODE_IS_COMPLETE(om_node_impl->parent, env)))
{
- token = AXIS2_OM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node_impl->builder, env);
+ token = AXIOM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node_impl->builder, env);
if(token == -1)
return NULL;
}
@@ -646,16 +646,16 @@
return om_node_impl->next_sibling;
}
-axis2_om_types_t AXIS2_CALL
-axis2_om_node_get_node_type(axis2_om_node_t *om_node,
+axiom_types_t AXIS2_CALL
+axiom_node_get_node_type(axiom_node_t *om_node,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_OM_INVALID);
+ AXIS2_ENV_CHECK(env, AXIOM_INVALID);
return AXIS2_INTF_TO_IMPL(om_node)->node_type;
}
axis2_bool_t AXIS2_CALL
-axis2_om_node_is_complete(axis2_om_node_t *om_node,
+axiom_node_is_complete(axiom_node_t *om_node,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -663,8 +663,8 @@
}
-struct axis2_om_document* AXIS2_CALL
-axis2_om_node_get_document(axis2_om_node_t *om_node,
+struct axiom_document* AXIS2_CALL
+axiom_node_get_document(axiom_node_t *om_node,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -672,7 +672,7 @@
}
void* AXIS2_CALL
-axis2_om_node_get_data_element(axis2_om_node_t *om_node,
+axiom_node_get_data_element(axiom_node_t *om_node,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -684,14 +684,14 @@
only sets the first_child link because this is needed by builder
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_first_child(axis2_om_node_t *om_node,const axis2_env_t *env,
- axis2_om_node_t *first_child)
+axiom_node_set_first_child(axiom_node_t *om_node,const axis2_env_t *env,
+ axiom_node_t *first_child)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, first_child, AXIS2_FAILURE);
/** set the parent */
- axis2_om_node_set_parent(first_child, env, om_node);
+ axiom_node_set_parent(first_child, env, om_node);
AXIS2_INTF_TO_IMPL(om_node)->first_child = first_child;
return AXIS2_SUCCESS;
@@ -702,9 +702,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_previous_sibling(axis2_om_node_t *om_node,
+axiom_node_set_previous_sibling(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *prev_sibling)
+ axiom_node_t *prev_sibling)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -720,9 +720,9 @@
only sets the next sibling link;
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_next_sibling(axis2_om_node_t *om_node,
+axiom_node_set_next_sibling(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_node_t *next_sibling)
+ axiom_node_t *next_sibling)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
@@ -737,9 +737,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_node_type(axis2_om_node_t *om_node,
+axiom_node_set_node_type(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_types_t type)
+ axiom_types_t type)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -752,7 +752,7 @@
only used in om and soap
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_data_element(axis2_om_node_t *om_node,
+axiom_node_set_data_element(axiom_node_t *om_node,
const axis2_env_t *env,
void* data_element)
{
@@ -770,7 +770,7 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_complete(axis2_om_node_t *om_node,
+axiom_node_set_complete(axiom_node_t *om_node,
const axis2_env_t *env,
axis2_bool_t done)
{
@@ -785,9 +785,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_document(axis2_om_node_t *om_node,
+axiom_node_set_document(axiom_node_t *om_node,
const axis2_env_t *env,
- struct axis2_om_document *om_doc)
+ struct axiom_document *om_doc)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
@@ -803,9 +803,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_node_set_builder(axis2_om_node_t *om_node,
+axiom_node_set_builder(axiom_node_t *om_node,
const axis2_env_t *env,
- axis2_om_stax_builder_t* builder)
+ axiom_stax_builder_t* builder)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, builder, AXIS2_FAILURE);
@@ -817,8 +817,8 @@
/**
* This is an internal function
*/
-AXIS2_EXTERN axis2_om_stax_builder_t * AXIS2_CALL
-axis2_om_node_get_builder(axis2_om_node_t *om_node,
+AXIS2_EXTERN axiom_stax_builder_t * AXIS2_CALL
+axiom_node_get_builder(axiom_node_t *om_node,
const axis2_env_t *env)
{
if(!om_node)
@@ -827,12 +827,12 @@
}
axis2_char_t * AXIS2_CALL
-axis2_om_node_to_string(axis2_om_node_t *om_node,
+axiom_node_to_string(axiom_node_t *om_node,
const axis2_env_t *env)
{
int status = AXIS2_SUCCESS;
- axis2_om_output_t *om_output = NULL;
+ axiom_output_t *om_output = NULL;
axis2_xml_writer_t *xml_writer = NULL;
axis2_char_t *xml = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -843,17 +843,17 @@
if(!xml_writer)
return NULL;
- om_output = axis2_om_output_create(env, xml_writer);
+ om_output = axiom_output_create(env, xml_writer);
if(!om_output)
{
AXIS2_XML_WRITER_FREE(xml_writer, env);
return NULL;
}
- status = AXIS2_OM_NODE_SERIALIZE(om_node, env, om_output);
+ status = AXIOM_NODE_SERIALIZE(om_node, env, om_output);
if(status == AXIS2_SUCCESS)
{
xml = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
}
- AXIS2_OM_OUTPUT_FREE(om_output, env);
+ AXIOM_OUTPUT_FREE(om_output, env);
return xml;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Mon Jun 12 01:22:58 2006
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include <axis2_om_output.h>
+#include <axiom_output.h>
#include <stdarg.h>
#include <axis2_string.h>
#include <axis2_xml_writer.h>
-#include <axis2_om_text.h>
+#include <axiom_text.h>
#include <axis2_soap_const.h>
#include <axis2_array_list.h>
#include <axis2_uuid_gen.h>
@@ -32,9 +32,9 @@
/****************************** impl struct ***********************************/
-typedef struct axis2_om_output_impl_t
+typedef struct axiom_output_impl_t
{
- axis2_om_output_t om_output;
+ axiom_output_t om_output;
/** axis2_xml_writer. any xml writer which
implemet axis2_xml_writer.h interface */
@@ -64,113 +64,113 @@
axis2_char_t *mime_boundry;
-}axis2_om_output_impl_t;
+}axiom_output_impl_t;
/************************ Macro ***********************************************/
-#define AXIS2_INTF_TO_IMPL(output) ((axis2_om_output_impl_t*)output)
+#define AXIS2_INTF_TO_IMPL(output) ((axiom_output_impl_t*)output)
/************************ function prototypes *********************************/
axis2_status_t AXIS2_CALL
-axis2_om_output_free(axis2_om_output_t *om_output,
+axiom_output_free(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_output_is_soap11(axis2_om_output_t *om_output,
+axiom_output_is_soap11(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
-axis2_om_output_is_ignore_xml_declaration(axis2_om_output_t *om_output,
+axiom_output_is_ignore_xml_declaration(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_output_set_ignore_xml_declaration
- (axis2_om_output_t *om_output,
+axiom_output_set_ignore_xml_declaration
+ (axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t ignore_xml_dec);
axis2_status_t AXIS2_CALL
-axis2_om_output_set_soap11(axis2_om_output_t *om_output,
+axiom_output_set_soap11(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t soap11);
axis2_status_t AXIS2_CALL
-axis2_om_output_set_xml_version(axis2_om_output_t *om_output,
+axiom_output_set_xml_version(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_char_t *xml_version);
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_xml_version(axis2_om_output_t *om_output,
+axiom_output_get_xml_version(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_output_set_char_set_encoding(axis2_om_output_t *om_output,
+axiom_output_set_char_set_encoding(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_char_t *char_set_encoding);
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_char_set_encoding(axis2_om_output_t *om_output,
+axiom_output_get_char_set_encoding(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_output_set_do_optimize(axis2_om_output_t *om_output,
+axiom_output_set_do_optimize(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t optimize);
axis2_bool_t AXIS2_CALL
-axis2_om_output_is_optimized(axis2_om_output_t *om_output,
+axiom_output_is_optimized(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_xml_writer_t* AXIS2_CALL
-axis2_om_output_get_xml_writer(axis2_om_output_t *om_output,
+axiom_output_get_xml_writer(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_output_write_xml_version_encoding(axis2_om_output_t *om_output,
+axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_next_content_id(axis2_om_output_t *om_output,
+axiom_output_get_next_content_id(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_root_content_id(axis2_om_output_t *om_output,
+axiom_output_get_root_content_id(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_mime_boundry(axis2_om_output_t *om_output,
+axiom_output_get_mime_boundry(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_byte_t* AXIS2_CALL
-axis2_om_output_flush(axis2_om_output_t *om_output,
+axiom_output_flush(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_byte_t **output_stream,
int *output_stream_size);
const axis2_char_t* AXIS2_CALL
-axis2_om_output_get_content_type(axis2_om_output_t *om_output,
+axiom_output_get_content_type(axiom_output_t *om_output,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_output_write_optimized(axis2_om_output_t *om_output,
+axiom_output_write_optimized(axiom_output_t *om_output,
const axis2_env_t *env,
- axis2_om_text_t *om_text);
+ axiom_text_t *om_text);
/*********************** end function prototypes ******************************/
-AXIS2_EXTERN axis2_om_output_t * AXIS2_CALL
-axis2_om_output_create (const axis2_env_t *env,
+AXIS2_EXTERN axiom_output_t * AXIS2_CALL
+axiom_output_create (const axis2_env_t *env,
axis2_xml_writer_t *xml_writer)
{
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- om_output_impl = (axis2_om_output_impl_t *) AXIS2_MALLOC (
+ om_output_impl = (axiom_output_impl_t *) AXIS2_MALLOC (
env->allocator,
- sizeof (axis2_om_output_impl_t));
+ sizeof (axiom_output_impl_t));
if (!om_output_impl)
{
@@ -204,9 +204,9 @@
return NULL;
}
- om_output_impl->om_output.ops = (axis2_om_output_ops_t *)AXIS2_MALLOC(
+ om_output_impl->om_output.ops = (axiom_output_ops_t *)AXIS2_MALLOC(
env->allocator,
- sizeof(axis2_om_output_ops_t));
+ sizeof(axiom_output_ops_t));
if(!(om_output_impl->om_output.ops))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -214,63 +214,63 @@
return NULL;
}
om_output_impl->om_output.ops->free_fn =
- axis2_om_output_free;
+ axiom_output_free;
om_output_impl->om_output.ops->is_soap11 =
- axis2_om_output_is_soap11;
+ axiom_output_is_soap11;
om_output_impl->om_output.ops->get_xml_version =
- axis2_om_output_get_xml_version;
+ axiom_output_get_xml_version;
om_output_impl->om_output.ops->set_xml_version =
- axis2_om_output_set_xml_version;
+ axiom_output_set_xml_version;
om_output_impl->om_output.ops->get_char_set_encoding =
- axis2_om_output_get_char_set_encoding;
+ axiom_output_get_char_set_encoding;
om_output_impl->om_output.ops->set_char_set_encoding =
- axis2_om_output_set_char_set_encoding;
+ axiom_output_set_char_set_encoding;
om_output_impl->om_output.ops->get_xml_writer =
- axis2_om_output_get_xml_writer;
+ axiom_output_get_xml_writer;
om_output_impl->om_output.ops->set_do_optimize =
- axis2_om_output_set_do_optimize;
+ axiom_output_set_do_optimize;
om_output_impl->om_output.ops->is_optimized =
- axis2_om_output_is_optimized;
+ axiom_output_is_optimized;
om_output_impl->om_output.ops->is_ignore_xml_declaration =
- axis2_om_output_is_ignore_xml_declaration;
+ axiom_output_is_ignore_xml_declaration;
om_output_impl->om_output.ops->set_soap11 =
- axis2_om_output_set_soap11;
+ axiom_output_set_soap11;
om_output_impl->om_output.ops->write_xml_version_encoding =
- axis2_om_output_write_xml_version_encoding;
+ axiom_output_write_xml_version_encoding;
- om_output_impl->om_output.ops->get_next_content_id = axis2_om_output_get_next_content_id;
+ om_output_impl->om_output.ops->get_next_content_id = axiom_output_get_next_content_id;
om_output_impl->om_output.ops->get_content_type =
- axis2_om_output_get_content_type;
+ axiom_output_get_content_type;
om_output_impl->om_output.ops->get_root_content_id =
- axis2_om_output_get_root_content_id;
+ axiom_output_get_root_content_id;
om_output_impl->om_output.ops->get_mime_boundry =
- axis2_om_output_get_mime_boundry;
+ axiom_output_get_mime_boundry;
om_output_impl->om_output.ops->flush =
- axis2_om_output_flush;
+ axiom_output_flush;
return &(om_output_impl->om_output);
}
axis2_status_t AXIS2_CALL
- axis2_om_output_free(axis2_om_output_t *om_output,
+ axiom_output_free(axiom_output_t *om_output,
const axis2_env_t *env)
{
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_output_impl = AXIS2_INTF_TO_IMPL(om_output);
@@ -324,7 +324,7 @@
}
axis2_bool_t AXIS2_CALL
-axis2_om_output_is_soap11(axis2_om_output_t *om_output,
+axiom_output_is_soap11(axiom_output_t *om_output,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -332,8 +332,8 @@
}
axis2_bool_t AXIS2_CALL
-axis2_om_output_is_ignore_xml_declaration
- (axis2_om_output_t *om_output,
+axiom_output_is_ignore_xml_declaration
+ (axiom_output_t *om_output,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -341,8 +341,8 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_set_ignore_xml_declaration
- (axis2_om_output_t *om_output,
+axiom_output_set_ignore_xml_declaration
+ (axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t ignore_xml_dec)
{
@@ -352,7 +352,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_set_soap11(axis2_om_output_t *om_output,
+axiom_output_set_soap11(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t soap11)
{
@@ -362,11 +362,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_set_xml_version(axis2_om_output_t *om_output,
+axiom_output_set_xml_version(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_char_t *xml_version)
{
- axis2_om_output_impl_t *output_impl = NULL;
+ axiom_output_impl_t *output_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, xml_version, AXIS2_FAILURE);
@@ -387,7 +387,7 @@
}
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_xml_version(axis2_om_output_t *om_output,
+axiom_output_get_xml_version(axiom_output_t *om_output,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -395,12 +395,12 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_set_char_set_encoding
- (axis2_om_output_t *om_output,
+axiom_output_set_char_set_encoding
+ (axiom_output_t *om_output,
const axis2_env_t *env,
axis2_char_t *char_set_encoding)
{
- axis2_om_output_impl_t *output_impl = NULL;
+ axiom_output_impl_t *output_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, char_set_encoding, AXIS2_FAILURE);
output_impl = AXIS2_INTF_TO_IMPL(om_output);
@@ -420,8 +420,8 @@
}
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_char_set_encoding
- (axis2_om_output_t *om_output,
+axiom_output_get_char_set_encoding
+ (axiom_output_t *om_output,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -429,8 +429,8 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_set_do_optimize
- (axis2_om_output_t *om_output,
+axiom_output_set_do_optimize
+ (axiom_output_t *om_output,
const axis2_env_t *env,
axis2_bool_t optimize)
{
@@ -440,8 +440,8 @@
}
axis2_xml_writer_t* AXIS2_CALL
-axis2_om_output_get_xml_writer
- (axis2_om_output_t *om_output,
+axiom_output_get_xml_writer
+ (axiom_output_t *om_output,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -449,17 +449,17 @@
}
axis2_bool_t AXIS2_CALL
-axis2_om_output_is_optimized(axis2_om_output_t *om_output,
+axiom_output_is_optimized(axiom_output_t *om_output,
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(om_output)->do_optimize;
}
const axis2_char_t* AXIS2_CALL
-axis2_om_output_get_content_type(axis2_om_output_t *om_output,
+axiom_output_get_content_type(axiom_output_t *om_output,
const axis2_env_t *env)
{
- axis2_om_output_impl_t *output_impl = NULL;
+ axiom_output_impl_t *output_impl = NULL;
const axis2_char_t *soap_content_type = NULL;
AXIS2_ENV_CHECK(env, NULL);
output_impl = AXIS2_INTF_TO_IMPL(om_output);
@@ -495,11 +495,11 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_write_optimized(axis2_om_output_t *om_output,
+axiom_output_write_optimized(axiom_output_t *om_output,
const axis2_env_t *env,
- axis2_om_text_t *om_text)
+ axiom_text_t *om_text)
{
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_output_impl = AXIS2_INTF_TO_IMPL(om_output);
if(NULL != om_output_impl->binary_node_list)
@@ -518,10 +518,10 @@
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_next_content_id(axis2_om_output_t *om_output,
+axiom_output_get_next_content_id(axiom_output_t *om_output,
const axis2_env_t *env)
{
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
axis2_char_t *uuid = NULL;
axis2_char_t *temp_str = NULL;
axis2_char_t *temp_str1 = NULL;
@@ -568,10 +568,10 @@
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_root_content_id(axis2_om_output_t *om_output,
+axiom_output_get_root_content_id(axiom_output_t *om_output,
const axis2_env_t *env)
{
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
axis2_char_t *temp_str = NULL;
axis2_char_t *uuid = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -602,10 +602,10 @@
}
axis2_char_t* AXIS2_CALL
-axis2_om_output_get_mime_boundry(axis2_om_output_t *om_output,
+axiom_output_get_mime_boundry(axiom_output_t *om_output,
const axis2_env_t *env)
{
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
axis2_char_t *uuid = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -629,14 +629,14 @@
/******************************************************************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_om_output_write (axis2_om_output_t * om_output,
+axiom_output_write (axiom_output_t * om_output,
const axis2_env_t *env,
- axis2_om_types_t type,
+ axiom_types_t type,
int no_of_args, ...)
{
int status = AXIS2_SUCCESS;
axis2_char_t *args_list[MAX_ARGS];
- axis2_om_output_impl_t *om_output_impl = NULL;
+ axiom_output_impl_t *om_output_impl = NULL;
int i = 0;
va_list ap;
@@ -653,7 +653,7 @@
switch (type)
{
- case AXIS2_OM_ELEMENT:
+ case AXIOM_ELEMENT:
switch (no_of_args)
@@ -687,7 +687,7 @@
}
break;
- case AXIS2_OM_ATTRIBUTE:
+ case AXIOM_ATTRIBUTE:
switch (no_of_args)
{
case 2:
@@ -718,23 +718,23 @@
}
break;
- case AXIS2_OM_NAMESPACE:
+ case AXIOM_NAMESPACE:
status = AXIS2_XML_WRITER_WRITE_NAMESPACE(om_output_impl->xml_writer,
env,
args_list[0],
args_list[1]);
break;
- case AXIS2_OM_TEXT:
+ case AXIOM_TEXT:
status = AXIS2_XML_WRITER_WRITE_CHARACTERS(om_output_impl->xml_writer,
env,
args_list[0]);
break;
- case AXIS2_OM_COMMENT:
+ case AXIOM_COMMENT:
status = AXIS2_XML_WRITER_WRITE_COMMENT(om_output_impl->xml_writer,
env,
args_list[0]);
break;
- case AXIS2_OM_PROCESSING_INSTRUCTION:
+ case AXIOM_PROCESSING_INSTRUCTION:
switch(no_of_args)
{
case 1:
@@ -754,7 +754,7 @@
break;
}
break;
- case AXIS2_OM_DOCTYPE:
+ case AXIOM_DOCTYPE:
status = AXIS2_XML_WRITER_WRITE_DTD(om_output_impl->xml_writer,
env,
args_list[0]);
@@ -773,10 +773,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_output_write_xml_version_encoding(axis2_om_output_t *om_output,
+axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
const axis2_env_t *env)
{
- axis2_om_output_impl_t *output_impl = NULL;
+ axiom_output_impl_t *output_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
output_impl = AXIS2_INTF_TO_IMPL(om_output);
return AXIS2_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(
@@ -788,12 +788,12 @@
}
axis2_byte_t* AXIS2_CALL
-axis2_om_output_flush(axis2_om_output_t *om_output,
+axiom_output_flush(axiom_output_t *om_output,
const axis2_env_t *env,
axis2_byte_t **output_stream,
int *output_stream_size)
{
- axis2_om_output_impl_t *output_impl = NULL;
+ axiom_output_impl_t *output_impl = NULL;
const axis2_char_t *soap_content_type = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -814,8 +814,8 @@
soap_content_type = AXIS2_SOAP12_CONTENT_TYPE;
}
output_impl->mime_output = axis2_mime_output_create(env);
- output_impl->mime_boundry = axis2_om_output_get_mime_boundry(om_output, env);
- root_content_id = axis2_om_output_get_root_content_id(om_output, env);
+ output_impl->mime_boundry = axiom_output_get_mime_boundry(om_output, env);
+ root_content_id = axiom_output_get_root_content_id(om_output, env);
AXIS2_MIME_OUTPUT_COMPLETE(output_impl->mime_output, env, &byte_stream, &stream_size,
buffer, output_impl->binary_node_list, output_impl->mime_boundry,
output_impl->root_content_id, output_impl->char_set_encoding,
Modified: webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c?rev=413605&r1=413604&r2=413605&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c Mon Jun 12 01:22:58 2006
@@ -14,61 +14,61 @@
* limitations under the License.
*/
-#include <axis2_om_processing_instruction.h>
+#include <axiom_processing_instruction.h>
#include <axis2_string.h>
-#include "axis2_om_node_internal.h"
+#include "axiom_node_internal.h"
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_free (axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_free (axiom_processing_instruction_t *om_pi,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_set_value(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_set_value(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
const axis2_char_t *value);
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_set_target(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_set_target(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
const axis2_char_t *target);
axis2_char_t* AXIS2_CALL
-axis2_om_processing_instruction_get_value(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_get_value(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
-axis2_om_processing_instruction_get_target(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_get_target(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_serialize
- (axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_serialize
+ (axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
- axis2_om_output_t *om_output);
+ axiom_output_t *om_output);
-/*********************** axis2_om_processing_instruction_impl_t struct ********/
-typedef struct axis2_om_processing_instruction_impl
+/*********************** axiom_processing_instruction_impl_t struct ********/
+typedef struct axiom_processing_instruction_impl
{
- axis2_om_processing_instruction_t om_pi;
+ axiom_processing_instruction_t om_pi;
/** processing instruction target */
axis2_char_t *target;
/** processing instruction value */
axis2_char_t *value;
-}axis2_om_processing_instruction_impl_t;
+}axiom_processing_instruction_impl_t;
/******************************************************************************/
-#define AXIS2_INTF_TO_IMPL(om_processing_ins) ((axis2_om_processing_instruction_impl_t*)om_processing_ins)
+#define AXIS2_INTF_TO_IMPL(om_processing_ins) ((axiom_processing_instruction_impl_t*)om_processing_ins)
/******************************************************************************/
-axis2_om_processing_instruction_t *AXIS2_CALL
-axis2_om_processing_instruction_create (const axis2_env_t *env,
- axis2_om_node_t * parent,
+axiom_processing_instruction_t *AXIS2_CALL
+axiom_processing_instruction_create (const axis2_env_t *env,
+ axiom_node_t * parent,
const axis2_char_t * target,
const axis2_char_t * value,
- axis2_om_node_t ** node)
+ axiom_node_t ** node)
{
- axis2_om_processing_instruction_impl_t *processing_instruction = NULL;
+ axiom_processing_instruction_impl_t *processing_instruction = NULL;
AXIS2_ENV_CHECK(env,NULL);
if (!node || !target || !value)
@@ -77,7 +77,7 @@
return NULL;
}
- *node = axis2_om_node_create (env);
+ *node = axiom_node_create (env);
if (!*node)
{
@@ -85,8 +85,8 @@
return NULL;
}
- processing_instruction = (axis2_om_processing_instruction_impl_t *) AXIS2_MALLOC (
- env->allocator,sizeof(axis2_om_processing_instruction_impl_t));
+ processing_instruction = (axiom_processing_instruction_impl_t *) AXIS2_MALLOC (
+ env->allocator,sizeof(axiom_processing_instruction_impl_t));
if (!processing_instruction)
{
@@ -122,18 +122,18 @@
return NULL;
}
}
- axis2_om_node_set_data_element(*node, env, processing_instruction);
- axis2_om_node_set_node_type(*node, env, AXIS2_OM_PROCESSING_INSTRUCTION);
+ axiom_node_set_data_element(*node, env, processing_instruction);
+ axiom_node_set_node_type(*node, env, AXIOM_PROCESSING_INSTRUCTION);
if (parent)
{
- AXIS2_OM_NODE_ADD_CHILD(parent, env, (*node));
+ AXIOM_NODE_ADD_CHILD(parent, env, (*node));
}
/* ops */
processing_instruction->om_pi.ops = NULL;
processing_instruction->om_pi.ops =
- (axis2_om_processing_instruction_ops_t *) AXIS2_MALLOC (
- env->allocator, sizeof(axis2_om_processing_instruction_ops_t));
+ (axiom_processing_instruction_ops_t *) AXIS2_MALLOC (
+ env->allocator, sizeof(axiom_processing_instruction_ops_t));
if (!processing_instruction->om_pi.ops)
{
@@ -146,26 +146,26 @@
}
processing_instruction->om_pi.ops->free =
- axis2_om_processing_instruction_free;
+ axiom_processing_instruction_free;
processing_instruction->om_pi.ops->set_target =
- axis2_om_processing_instruction_set_target;
+ axiom_processing_instruction_set_target;
processing_instruction->om_pi.ops->get_target =
- axis2_om_processing_instruction_get_target;
+ axiom_processing_instruction_get_target;
processing_instruction->om_pi.ops->get_value =
- axis2_om_processing_instruction_get_value;
+ axiom_processing_instruction_get_value;
processing_instruction->om_pi.ops->set_value =
- axis2_om_processing_instruction_set_value;
+ axiom_processing_instruction_set_value;
processing_instruction->om_pi.ops->serialize =
- axis2_om_processing_instruction_serialize;
+ axiom_processing_instruction_serialize;
return &(processing_instruction->om_pi);
}
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_free (axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_free (axiom_processing_instruction_t *om_pi,
const axis2_env_t *env)
{
- axis2_om_processing_instruction_impl_t *pi_impl = NULL;
+ axiom_processing_instruction_impl_t *pi_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
pi_impl = AXIS2_INTF_TO_IMPL(om_pi);
@@ -188,7 +188,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_set_value(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_set_value(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
const axis2_char_t *value)
{
@@ -200,7 +200,7 @@
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_set_target(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_set_target(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
const axis2_char_t *target)
{
@@ -212,14 +212,14 @@
}
axis2_char_t* AXIS2_CALL
-axis2_om_processing_instruction_get_value(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_get_value(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(om_pi)->value;
}
axis2_char_t* AXIS2_CALL
-axis2_om_processing_instruction_get_target(axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_get_target(axiom_processing_instruction_t *om_pi,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -228,25 +228,25 @@
axis2_status_t AXIS2_CALL
-axis2_om_processing_instruction_serialize
- (axis2_om_processing_instruction_t *om_pi,
+axiom_processing_instruction_serialize
+ (axiom_processing_instruction_t *om_pi,
const axis2_env_t *env,
- axis2_om_output_t *om_output)
+ axiom_output_t *om_output)
{
- axis2_om_processing_instruction_impl_t *om_pi_impl;
+ axiom_processing_instruction_impl_t *om_pi_impl;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
om_pi_impl = AXIS2_INTF_TO_IMPL(om_pi);
if(om_pi_impl->target && om_pi_impl->value)
- return axis2_om_output_write(om_output, env,
- AXIS2_OM_PROCESSING_INSTRUCTION,
+ return axiom_output_write(om_output, env,
+ AXIOM_PROCESSING_INSTRUCTION,
2, om_pi_impl->target, om_pi_impl->value);
else if(om_pi_impl->target)
- return axis2_om_output_write(om_output, env,
- AXIS2_OM_PROCESSING_INSTRUCTION,
+ return axiom_output_write(om_output, env,
+ AXIOM_PROCESSING_INSTRUCTION,
2, om_pi_impl->target, om_pi_impl->value);
return AXIS2_FAILURE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org