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 2007/09/28 12:22:36 UTC
svn commit: r580284 [4/12] - in /webservices/axis2/trunk/c/axiom:
src/attachments/ src/om/ src/parser/ src/parser/guththila/
src/parser/libxml2/ src/soap/ src/util/ test/om/ test/soap/
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=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Fri Sep 28 03:22:20 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -27,22 +28,30 @@
struct axiom_node
{
+
/** document only availble if build through builder */
struct axiom_document *om_doc;
axiom_stax_builder_t *builder;
+
/** parent node */
axiom_node_t *parent;
+
/** previous sibling */
axiom_node_t *prev_sibling;
+
/** next sibling */
axiom_node_t *next_sibling;
+
/** first child */
axiom_node_t *first_child;
+
/** last child */
axiom_node_t *last_child;
+
/** node type, indicates the type stored in data_element */
axiom_types_t node_type;
+
/** done true means that this node is completely built , false otherwise */
int done;
@@ -52,13 +61,13 @@
};
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_create(const axutil_env_t *env)
+axiom_node_create(
+ const axutil_env_t * env)
{
axiom_node_t *node = NULL;
AXIS2_ENV_CHECK(env, NULL);
- node = (axiom_node_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_node_t));
+ node = (axiom_node_t *) AXIS2_MALLOC(env->allocator, sizeof(axiom_node_t));
if (!node)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
@@ -83,8 +92,9 @@
* before calling this function
*/
AXIS2_EXTERN void AXIS2_CALL
-axiom_node_free_tree(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_free_tree(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
axiom_node_t *child_node = NULL;
AXIS2_ENV_CHECK(env, void);
@@ -100,7 +110,7 @@
child_node = axiom_node_detach(om_node->first_child, env);
if (child_node)
{
- axiom_node_free_tree(child_node , env);
+ axiom_node_free_tree(child_node, env);
}
}
}
@@ -109,32 +119,35 @@
{
if (om_node->data_element)
{
- axiom_element_free((axiom_element_t*)(om_node->data_element), env);
+ axiom_element_free((axiom_element_t *) (om_node->data_element),
+ env);
}
}
else if (om_node->node_type == AXIOM_COMMENT)
{
if (om_node->data_element)
{
- axiom_comment_free((axiom_comment_t*)(om_node->data_element), env);
+ axiom_comment_free((axiom_comment_t *) (om_node->data_element),
+ env);
}
}
else if (om_node->node_type == AXIOM_DOCTYPE)
{
- /*axiom_doctype_free((axiom_doctype_t*)(om_node->data_element), env);*/
+ /*axiom_doctype_free((axiom_doctype_t*)(om_node->data_element), env); */
}
else if (om_node->node_type == AXIOM_PROCESSING_INSTRUCTION)
{
if (om_node->data_element)
{
- axiom_processing_instruction_free((axiom_processing_instruction_t*)(om_node->data_element), env);
+ axiom_processing_instruction_free((axiom_processing_instruction_t
+ *) (om_node->data_element), env);
}
}
else if (om_node->node_type == AXIOM_TEXT)
{
if (om_node->data_element)
{
- axiom_text_free((axiom_text_t*)(om_node->data_element), env);
+ axiom_text_free((axiom_text_t *) (om_node->data_element), env);
}
}
@@ -144,9 +157,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_add_child(axiom_node_t *om_node,
- const axutil_env_t *env,
- axiom_node_t *child)
+axiom_node_add_child(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ axiom_node_t * child)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, child, AXIS2_FAILURE);
@@ -164,7 +178,7 @@
else
{
axiom_node_t *last_sib = NULL;
- last_sib = om_node->last_child;
+ last_sib = om_node->last_child;
if (last_sib)
{
last_sib->next_sibling = child;
@@ -172,14 +186,15 @@
}
}
- child->parent = om_node;
+ child->parent = om_node;
om_node->last_child = child;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_detach(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_detach(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
axiom_node_t *parent = NULL;
@@ -189,16 +204,14 @@
AXIS2_PARAM_CHECK(env->error, parent, NULL);
-
if (!(om_node->prev_sibling))
{
- parent->first_child =
- om_node->next_sibling;
+ parent->first_child = om_node->next_sibling;
}
else
{
axiom_node_t *prev_sib = NULL;
- prev_sib = om_node->prev_sibling;
+ prev_sib = om_node->prev_sibling;
if (prev_sib)
{
prev_sib->next_sibling = om_node->next_sibling;
@@ -215,8 +228,7 @@
}
}
- if ((parent->last_child) &&
- ((parent->last_child) == om_node))
+ if ((parent->last_child) && ((parent->last_child) == om_node))
{
parent->last_child = om_node->prev_sibling;
}
@@ -234,8 +246,9 @@
not to be used by users
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_parent(axiom_node_t *om_node,
- const axutil_env_t *env,
+axiom_node_set_parent(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
axiom_node_t * parent)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -247,7 +260,7 @@
AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
if (parent == om_node->parent)
- { /* same parent already exist */
+ { /* same parent already exist */
return AXIS2_SUCCESS;
}
/* if a new parent is assigned in place of existing
@@ -255,7 +268,7 @@
*/
if (om_node->parent)
{
- om_node = axiom_node_detach(om_node, env);
+ om_node = axiom_node_detach(om_node, env);
}
om_node->parent = parent;
@@ -263,7 +276,6 @@
return AXIS2_SUCCESS;
}
-
/**
* This will insert a sibling just after the current information item
* @param node the node in consideration
@@ -271,8 +283,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_insert_sibling_after(axiom_node_t * om_node,
- const axutil_env_t *env,
+axiom_node_insert_sibling_after(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
axiom_node_t * node_to_insert)
{
axiom_node_t *next_sib = NULL;
@@ -299,8 +312,9 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_insert_sibling_before(axiom_node_t *om_node,
- const axutil_env_t *env,
+axiom_node_insert_sibling_before(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
axiom_node_t * node_to_insert)
{
axiom_node_t *prev_sibling = NULL;
@@ -308,7 +322,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node_to_insert, AXIS2_FAILURE);
- node_to_insert->parent = om_node->parent ;
+ node_to_insert->parent = om_node->parent;
node_to_insert->prev_sibling = om_node->prev_sibling;
@@ -334,9 +348,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_serialize(axiom_node_t *om_node,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_node_serialize(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ axiom_output_t * om_output)
{
int status = AXIS2_SUCCESS;
@@ -355,16 +370,18 @@
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
- do {
+ do
+ {
if (om_node->node_type == AXIOM_ELEMENT)
{
if (om_node->data_element)
{
- status = axiom_element_serialize_start_part((axiom_element_t *)(om_node->data_element),
- env,
- om_output,
- om_node);
+ status =
+ axiom_element_serialize_start_part((axiom_element_t
+ *) (om_node->
+ data_element), env,
+ om_output, om_node);
}
if (status != AXIS2_SUCCESS)
{
@@ -375,8 +392,10 @@
{
if (om_node->data_element)
{
- status = axiom_data_source_serialize((axiom_data_source_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_data_source_serialize((axiom_data_source_t
+ *) (om_node->data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -387,8 +406,10 @@
{
if (om_node->data_element)
{
- status = axiom_text_serialize((axiom_text_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_text_serialize((axiom_text_t *) (om_node->
+ data_element), env,
+ om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -399,8 +420,10 @@
{
if (om_node->data_element)
{
- status = axiom_comment_serialize((axiom_comment_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_comment_serialize((axiom_comment_t *) (om_node->
+ data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -411,8 +434,10 @@
{
if (om_node->data_element)
{
- status = axiom_doctype_serialize((axiom_doctype_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_doctype_serialize((axiom_doctype_t *) (om_node->
+ data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -424,8 +449,7 @@
if (om_node->data_element)
{
status =
- axiom_processing_instruction_serialize((axiom_processing_instruction_t*)(om_node->data_element),
- env, om_output);
+ axiom_processing_instruction_serialize((axiom_processing_instruction_t *) (om_node->data_element), env, om_output);
}
if (status != AXIS2_SUCCESS)
@@ -434,7 +458,6 @@
}
}
-
temp_node = axiom_node_get_first_child(om_node, env);
/* serialize children of this node */
if (temp_node)
@@ -448,33 +471,36 @@
{
if (om_node->data_element)
{
- status = axiom_element_serialize_end_part((axiom_element_t *)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_element_serialize_end_part((axiom_element_t
+ *) (om_node->
+ data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
return status;
}
}
-
+
temp_node = axiom_node_get_next_sibling(om_node, env);
if (temp_node)
{
om_node = temp_node;
- nodes[count -1] = om_node;
+ nodes[count - 1] = om_node;
}
else
{
while (count > 1 && !temp_node)
{
count--;
- om_node = nodes[count -1];
+ om_node = nodes[count - 1];
if (om_node->node_type == AXIOM_ELEMENT)
{
if (om_node->data_element)
{
- status = axiom_element_serialize_end_part((axiom_element_t *)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_element_serialize_end_part((axiom_element_t *) (om_node->data_element), env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -484,28 +510,30 @@
temp_node = axiom_node_get_next_sibling(om_node, env);
}
-
+
if (temp_node && count > 1)
{
om_node = temp_node;
- nodes[count -1] = om_node;
+ nodes[count - 1] = om_node;
}
else
{
count--;
}
}
-
+
}
- } while(count > 0);
+ }
+ while (count > 0);
return status;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_serialize_sub_tree(axiom_node_t *om_node,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_node_serialize_sub_tree(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ axiom_output_t * om_output)
{
int status = AXIS2_SUCCESS;
@@ -526,7 +554,8 @@
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
- do {
+ do
+ {
if (om_node->node_type == AXIOM_ELEMENT)
{
@@ -535,22 +564,27 @@
axutil_hash_t *temp_namespaces = NULL;
axutil_hash_t *temp_attributes = NULL;
axiom_namespace_t *namespace = NULL;
- status = axiom_element_serialize_start_part(
- (axiom_element_t *)(om_node->data_element),
- env,
- om_output,
- om_node);
- temp_namespaces = axiom_element_get_namespaces(
- (axiom_element_t *)(om_node->data_element), env);
+ status = axiom_element_serialize_start_part((axiom_element_t
+ *) (om_node->
+ data_element),
+ env, om_output,
+ om_node);
+ temp_namespaces =
+ axiom_element_get_namespaces((axiom_element_t *) (om_node->
+ data_element),
+ env);
if (temp_namespaces)
{
axutil_hash_t *new_hash = NULL;
- new_hash = axutil_hash_overlay(temp_namespaces, env, namespaces);
+ new_hash =
+ axutil_hash_overlay(temp_namespaces, env, namespaces);
axutil_hash_free(namespaces, env);
namespaces = new_hash;
}
- namespace = axiom_element_get_namespace(
- (axiom_element_t *)(om_node->data_element), env, om_node);
+ namespace = axiom_element_get_namespace((axiom_element_t
+ *) (om_node->
+ data_element), env,
+ om_node);
if (namespace)
{
axiom_namespace_t *ns = NULL;
@@ -558,24 +592,25 @@
prefix = axiom_namespace_get_prefix(namespace, env);
if (prefix)
{
- ns = axutil_hash_get(namespaces, prefix, AXIS2_HASH_KEY_STRING);
+ ns = axutil_hash_get(namespaces, prefix,
+ AXIS2_HASH_KEY_STRING);
if (!ns)
{
- axiom_namespace_serialize(namespace, env, om_output);
- axutil_hash_set(namespaces, prefix,
- AXIS2_HASH_KEY_STRING, namespace);
+ axiom_namespace_serialize(namespace, env,
+ om_output);
+ axutil_hash_set(namespaces, prefix,
+ AXIS2_HASH_KEY_STRING, namespace);
}
}
}
-
- temp_attributes = axiom_element_get_all_attributes(
- (axiom_element_t *)(om_node->data_element), env);
+
+ temp_attributes = axiom_element_get_all_attributes((axiom_element_t *) (om_node->data_element), env);
if (temp_attributes)
{
axutil_hash_index_t *hi;
void *val;
for (hi = axutil_hash_first(temp_attributes, env); hi;
- hi = axutil_hash_next(env, hi))
+ hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, NULL, NULL, &val);
@@ -583,21 +618,27 @@
{
axiom_namespace_t *ns = NULL;
axis2_char_t *prefix = NULL;
-
- namespace = axiom_attribute_get_namespace((axiom_attribute_t *)val,
- env);
-
+
+ namespace =
+ axiom_attribute_get_namespace((axiom_attribute_t
+ *) val, env);
+
if (namespace)
{
- prefix = axiom_namespace_get_prefix(namespace, env);
+ prefix =
+ axiom_namespace_get_prefix(namespace, env);
if (prefix)
{
- ns = axutil_hash_get(namespaces, prefix, AXIS2_HASH_KEY_STRING);
+ ns = axutil_hash_get(namespaces, prefix,
+ AXIS2_HASH_KEY_STRING);
if (!ns)
{
- axiom_namespace_serialize(namespace, env, om_output);
- axutil_hash_set(namespaces, prefix,
- AXIS2_HASH_KEY_STRING, namespace);
+ axiom_namespace_serialize(namespace,
+ env,
+ om_output);
+ axutil_hash_set(namespaces, prefix,
+ AXIS2_HASH_KEY_STRING,
+ namespace);
}
}
}
@@ -618,8 +659,10 @@
{
if (om_node->data_element)
{
- status = axiom_data_source_serialize((axiom_data_source_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_data_source_serialize((axiom_data_source_t
+ *) (om_node->data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -630,8 +673,10 @@
{
if (om_node->data_element)
{
- status = axiom_text_serialize((axiom_text_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_text_serialize((axiom_text_t *) (om_node->
+ data_element), env,
+ om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -642,8 +687,10 @@
{
if (om_node->data_element)
{
- status = axiom_comment_serialize((axiom_comment_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_comment_serialize((axiom_comment_t *) (om_node->
+ data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -654,8 +701,10 @@
{
if (om_node->data_element)
{
- status = axiom_doctype_serialize((axiom_doctype_t*)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_doctype_serialize((axiom_doctype_t *) (om_node->
+ data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -667,8 +716,7 @@
if (om_node->data_element)
{
status =
- axiom_processing_instruction_serialize((axiom_processing_instruction_t*)(om_node->data_element),
- env, om_output);
+ axiom_processing_instruction_serialize((axiom_processing_instruction_t *) (om_node->data_element), env, om_output);
}
if (status != AXIS2_SUCCESS)
@@ -677,7 +725,6 @@
}
}
-
temp_node = axiom_node_get_first_child(om_node, env);
/* serialize children of this node */
if (temp_node)
@@ -691,33 +738,36 @@
{
if (om_node->data_element)
{
- status = axiom_element_serialize_end_part((axiom_element_t *)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_element_serialize_end_part((axiom_element_t
+ *) (om_node->
+ data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
{
return status;
}
}
-
+
temp_node = axiom_node_get_next_sibling(om_node, env);
if (temp_node)
{
om_node = temp_node;
- nodes[count -1] = om_node;
+ nodes[count - 1] = om_node;
}
else
{
while (count > 1 && !temp_node)
{
count--;
- om_node = nodes[count -1];
+ om_node = nodes[count - 1];
if (om_node->node_type == AXIOM_ELEMENT)
{
if (om_node->data_element)
{
- status = axiom_element_serialize_end_part((axiom_element_t *)(om_node->data_element),
- env, om_output);
+ status =
+ axiom_element_serialize_end_part((axiom_element_t *) (om_node->data_element), env, om_output);
}
if (status != AXIS2_SUCCESS)
{
@@ -727,45 +777,46 @@
temp_node = axiom_node_get_next_sibling(om_node, env);
}
-
+
if (temp_node && count > 1)
{
om_node = temp_node;
- nodes[count -1] = om_node;
+ nodes[count - 1] = om_node;
}
else
{
count--;
}
}
-
+
}
- } while(count > 0);
+ }
+ while (count > 0);
return status;
}
-
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_get_parent(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_parent(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->parent;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_get_first_child(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_first_child(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
int token = 0;
- if (! om_node)
+ if (!om_node)
{
return NULL;
}
/**********************************************************/
- while (!(om_node->first_child) && !(om_node->done)
- && om_node->builder)
+ while (!(om_node->first_child) && !(om_node->done) && om_node->builder)
{
token = axiom_stax_builder_next_with_token(om_node->builder, env);
if (token == -1)
@@ -773,23 +824,25 @@
return NULL;
}
}
+
/**********************************************************/
return om_node->first_child;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_get_first_element(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_first_element(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
int token = 0;
axiom_node_t *first_element;
- if (! om_node)
+ if (!om_node)
{
return NULL;
}
+
/**********************************************************/
- while (!(om_node->first_child) && !(om_node->done)
- && om_node->builder)
+ while (!(om_node->first_child) && !(om_node->done) && om_node->builder)
{
token = axiom_stax_builder_next_with_token(om_node->builder, env);
if (token == -1)
@@ -797,34 +850,39 @@
return NULL;
}
}
+
/**********************************************************/
first_element = om_node->first_child;
- while (first_element && (axiom_node_get_node_type(first_element, env) != AXIOM_ELEMENT))
+ while (first_element &&
+ (axiom_node_get_node_type(first_element, env) != AXIOM_ELEMENT))
{
- first_element = axiom_node_get_next_sibling (first_element, env);
+ first_element = axiom_node_get_next_sibling(first_element, env);
}
return first_element;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_get_last_child(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_last_child(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->last_child;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_get_previous_sibling(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_previous_sibling(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->prev_sibling;
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_node_get_next_sibling(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_next_sibling(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
int token = 0;
if (!om_node)
@@ -833,7 +891,7 @@
}
while (!(om_node->next_sibling) && om_node->parent &&
- om_node->builder && !(axiom_node_is_complete(om_node->parent, env)))
+ om_node->builder && !(axiom_node_is_complete(om_node->parent, env)))
{
token = axiom_stax_builder_next_with_token(om_node->builder, env);
if (token == -1)
@@ -846,30 +904,34 @@
}
AXIS2_EXTERN axiom_types_t AXIS2_CALL
-axiom_node_get_node_type(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_node_type(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->node_type;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_node_is_complete(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_is_complete(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->done;
}
AXIS2_EXTERN struct axiom_document *AXIS2_CALL
-axiom_node_get_document(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_document(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->om_doc;
}
-AXIS2_EXTERN void* AXIS2_CALL
-axiom_node_get_data_element(axiom_node_t *om_node,
- const axutil_env_t *env)
+AXIS2_EXTERN void *AXIS2_CALL
+axiom_node_get_data_element(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
return om_node->data_element;
}
@@ -879,12 +941,15 @@
only sets the first_child link because this is needed by builder
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_first_child(axiom_node_t *om_node, const axutil_env_t *env,
- axiom_node_t *first_child)
+axiom_node_set_first_child(
+ axiom_node_t * om_node,
+ const axutil_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 */
axiom_node_set_parent(first_child, env, om_node);
@@ -898,9 +963,10 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_previous_sibling(axiom_node_t *om_node,
- const axutil_env_t *env,
- axiom_node_t *prev_sibling)
+axiom_node_set_previous_sibling(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ axiom_node_t * prev_sibling)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -916,9 +982,10 @@
only sets the next sibling link;
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_next_sibling(axiom_node_t *om_node,
- const axutil_env_t *env,
- axiom_node_t *next_sibling)
+axiom_node_set_next_sibling(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ axiom_node_t * next_sibling)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
@@ -933,8 +1000,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_node_type(axiom_node_t *om_node,
- const axutil_env_t *env,
+axiom_node_set_node_type(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
axiom_types_t type)
{
@@ -949,9 +1017,10 @@
only used in om and soap
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_data_element(axiom_node_t *om_node,
- const axutil_env_t *env,
- void* data_element)
+axiom_node_set_data_element(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ void *data_element)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
@@ -966,8 +1035,9 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_complete(axiom_node_t *om_node,
- const axutil_env_t *env,
+axiom_node_set_complete(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
axis2_bool_t done)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -982,9 +1052,10 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_document(axiom_node_t *om_node,
- const axutil_env_t *env,
- struct axiom_document *om_doc)
+axiom_node_set_document(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ struct axiom_document * om_doc)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
@@ -998,9 +1069,10 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_node_set_builder(axiom_node_t *om_node,
- const axutil_env_t *env,
- axiom_stax_builder_t* builder)
+axiom_node_set_builder(
+ axiom_node_t * om_node,
+ const axutil_env_t * env,
+ axiom_stax_builder_t * builder)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_node, AXIS2_FAILURE);
@@ -1013,8 +1085,9 @@
* This is an internal function
*/
AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
-axiom_node_get_builder(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_get_builder(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
if (!om_node)
{
@@ -1024,8 +1097,9 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_node_to_string(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_to_string(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
int status = AXIS2_SUCCESS;
axiom_output_t *om_output = NULL;
@@ -1035,7 +1109,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
- AXIS2_XML_PARSER_TYPE_BUFFER);
+ AXIS2_XML_PARSER_TYPE_BUFFER);
if (!xml_writer)
{
return NULL;
@@ -1050,16 +1124,19 @@
status = axiom_node_serialize(om_node, env, om_output);
if (status == AXIS2_SUCCESS)
{
- xml = axutil_strdup(env, (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env));
+ xml =
+ axutil_strdup(env,
+ (axis2_char_t *) axiom_xml_writer_get_xml(xml_writer,
+ env));
}
axiom_output_free(om_output, env);
return xml;
}
-
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_node_sub_tree_to_string(axiom_node_t *om_node,
- const axutil_env_t *env)
+axiom_node_sub_tree_to_string(
+ axiom_node_t * om_node,
+ const axutil_env_t * env)
{
int status = AXIS2_SUCCESS;
axiom_output_t *om_output = NULL;
@@ -1069,7 +1146,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
- AXIS2_XML_PARSER_TYPE_BUFFER);
+ AXIS2_XML_PARSER_TYPE_BUFFER);
if (!xml_writer)
{
return NULL;
@@ -1084,7 +1161,10 @@
status = axiom_node_serialize_sub_tree(om_node, env, om_output);
if (status == AXIS2_SUCCESS)
{
- xml = axutil_strdup(env, (axis2_char_t*)axiom_xml_writer_get_xml(xml_writer, env));
+ xml =
+ axutil_strdup(env,
+ (axis2_char_t *) axiom_xml_writer_get_xml(xml_writer,
+ 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=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Fri Sep 28 03:22:20 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,14 +27,15 @@
#include <axiom_mime_output.h>
#define AXIS2_DEFAULT_CHAR_SET_ENCODING "UTF-8"
+
/** also defined in axiom_soap.h */
/** max args for om_output_write function */
#define MAX_ARGS 4
-
struct axiom_output
{
+
/** axiom_xml_writer. any xml writer which
implemet axiom_xml_writer.h interface */
axiom_xml_writer_t *xml_writer;
@@ -62,20 +64,20 @@
axis2_char_t *mime_boundry;
- axis2_char_t *content_type;
+ axis2_char_t *content_type;
};
AXIS2_EXTERN axiom_output_t *AXIS2_CALL
-axiom_output_create(const axutil_env_t *env,
- axiom_xml_writer_t *xml_writer)
+axiom_output_create(
+ const axutil_env_t * env,
+ axiom_xml_writer_t * xml_writer)
{
axiom_output_t *om_output = NULL;
AXIS2_ENV_CHECK(env, NULL);
- om_output = (axiom_output_t *) AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_output_t));
+ om_output = (axiom_output_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_output_t));
if (!om_output)
{
@@ -97,14 +99,15 @@
om_output->binary_node_list = NULL;
om_output->mime_output = NULL;
om_output->mime_boundry = NULL;
- om_output->content_type = NULL;
+ om_output->content_type = NULL;
return om_output;
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_output_free(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_free(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -139,34 +142,37 @@
{
axiom_mime_output_free(om_output->mime_output, env);
}
- if(om_output->content_type)
- {
- AXIS2_FREE(env->allocator, om_output->content_type);
- }
+ if (om_output->content_type)
+ {
+ AXIS2_FREE(env->allocator, om_output->content_type);
+ }
AXIS2_FREE(env->allocator, om_output);
return;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_output_is_soap11(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_is_soap11(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return om_output->is_soap11;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_output_is_ignore_xml_declaration(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_is_ignore_xml_declaration(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return om_output->ignore_xml_declaration;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_set_ignore_xml_declaration(axiom_output_t *om_output,
- const axutil_env_t *env,
+axiom_output_set_ignore_xml_declaration(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
axis2_bool_t ignore_xml_dec)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -175,8 +181,9 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_set_soap11(axiom_output_t *om_output,
- const axutil_env_t *env,
+axiom_output_set_soap11(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
axis2_bool_t soap11)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -185,9 +192,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_set_xml_version(axiom_output_t *om_output,
- const axutil_env_t *env,
- axis2_char_t *xml_version)
+axiom_output_set_xml_version(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
+ axis2_char_t * xml_version)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -195,7 +203,7 @@
if (om_output->xml_version)
{
- AXIS2_FREE(env->allocator, om_output->xml_version);
+ AXIS2_FREE(env->allocator, om_output->xml_version);
om_output->xml_version = NULL;
}
@@ -207,33 +215,37 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_output_get_xml_version(axiom_output_t *om_output,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_output_get_xml_version(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
return om_output->xml_version;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_set_char_set_encoding(axiom_output_t *om_output,
- const axutil_env_t *env,
- axis2_char_t *char_set_encoding)
+axiom_output_set_char_set_encoding(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
+ axis2_char_t * char_set_encoding)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_output->char_set_encoding = char_set_encoding;
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_output_get_char_set_encoding(axiom_output_t *om_output,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_output_get_char_set_encoding(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
return om_output->char_set_encoding;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_set_do_optimize(axiom_output_t *om_output,
- const axutil_env_t *env,
+axiom_output_set_do_optimize(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
axis2_bool_t optimize)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -242,22 +254,25 @@
}
AXIS2_EXTERN axiom_xml_writer_t *AXIS2_CALL
-axiom_output_get_xml_writer(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_get_xml_writer(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
return om_output->xml_writer;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_output_is_optimized(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_is_optimized(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
return om_output->do_optimize;
}
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
-axiom_output_get_content_type(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_get_content_type(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
const axis2_char_t *soap_content_type = NULL;
if (AXIS2_TRUE == om_output->do_optimize)
@@ -270,17 +285,23 @@
{
soap_content_type = AXIOM_SOAP12_CONTENT_TYPE;
}
- if(om_output->content_type)
- {
- AXIS2_FREE(env->allocator, om_output->content_type);
- om_output->content_type = NULL;
- }
-
- om_output->content_type = (axis2_char_t *)axiom_mime_output_get_content_type_for_mime(om_output->mime_output,
- env, om_output->mime_boundry,
- om_output->root_content_id, om_output->char_set_encoding,
- soap_content_type);
- return om_output->content_type;
+ if (om_output->content_type)
+ {
+ AXIS2_FREE(env->allocator, om_output->content_type);
+ om_output->content_type = NULL;
+ }
+
+ om_output->content_type =
+ (axis2_char_t *)
+ axiom_mime_output_get_content_type_for_mime(om_output->mime_output,
+ env,
+ om_output->mime_boundry,
+ om_output->
+ root_content_id,
+ om_output->
+ char_set_encoding,
+ soap_content_type);
+ return om_output->content_type;
}
else
{
@@ -297,9 +318,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_write_optimized(axiom_output_t *om_output,
- const axutil_env_t *env,
- axiom_text_t *om_text)
+axiom_output_write_optimized(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
+ axiom_text_t * om_text)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (om_output->binary_node_list)
@@ -319,8 +341,9 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_output_get_next_content_id(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_get_next_content_id(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
axis2_char_t *uuid = NULL;
axis2_char_t *temp_str = NULL;
@@ -365,12 +388,13 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_output_get_root_content_id(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_get_root_content_id(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
axis2_char_t *temp_str = NULL;
axis2_char_t *uuid = NULL;
-
+
if (!om_output->root_content_id)
{
uuid = axutil_uuid_gen(env);
@@ -396,8 +420,9 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_output_get_mime_boundry(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_get_mime_boundry(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
axis2_char_t *uuid = NULL;
if (!om_output->mime_boundary)
@@ -417,10 +442,12 @@
/******************************************************************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_output_write(axiom_output_t * om_output,
- const axutil_env_t *env,
+axiom_output_write(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
axiom_types_t type,
- int no_of_args, ...)
+ int no_of_args,
+ ...)
{
int status = AXIS2_SUCCESS;
axis2_char_t *args_list[MAX_ARGS];
@@ -436,44 +463,42 @@
}
va_end(ap);
-
if (type == AXIOM_ELEMENT)
{
if (no_of_args == 0)
{
status =
- axiom_xml_writer_write_end_element(om_output->xml_writer,
- env);
+ axiom_xml_writer_write_end_element(om_output->xml_writer, env);
}
else if (no_of_args == 1)
{
status =
axiom_xml_writer_write_start_element(om_output->xml_writer,
- env, args_list[0]);
+ env, args_list[0]);
}
else if (no_of_args == 2)
{
status =
- axiom_xml_writer_write_start_element_with_namespace(
- om_output->xml_writer,env,
- args_list[0],
- args_list[1]);
+ axiom_xml_writer_write_start_element_with_namespace(om_output->
+ xml_writer,
+ env,
+ args_list
+ [0],
+ args_list
+ [1]);
}
else if (no_of_args == 3)
{
status =
- axiom_xml_writer_write_start_element_with_namespace_prefix(
- om_output->xml_writer,
- env,
- args_list[0],
- args_list[1],
- args_list[2]);
+ axiom_xml_writer_write_start_element_with_namespace_prefix
+ (om_output->xml_writer, env, args_list[0], args_list[1],
+ args_list[2]);
}
}
else if (type == AXIOM_DATA_SOURCE)
{
status = axiom_xml_writer_write_raw(om_output->xml_writer,
- env, args_list[0]);
+ env, args_list[0]);
}
else if (type == AXIOM_ATTRIBUTE)
{
@@ -481,71 +506,66 @@
{
status =
axiom_xml_writer_write_attribute(om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ env,
+ args_list[0], args_list[1]);
}
else if (no_of_args == 3)
{
- status = axiom_xml_writer_write_attribute_with_namespace(
- om_output->xml_writer, env,
- args_list[0],
- args_list[1],
- args_list[2]);
+ status =
+ axiom_xml_writer_write_attribute_with_namespace(om_output->
+ xml_writer, env,
+ args_list[0],
+ args_list[1],
+ args_list[2]);
}
else if (no_of_args == 4)
{
status =
- axiom_xml_writer_write_attribute_with_namespace_prefix(
- om_output->xml_writer, env,
- args_list[0],
- args_list[1],
- args_list[2],
- args_list[3]);
+ axiom_xml_writer_write_attribute_with_namespace_prefix
+ (om_output->xml_writer, env, args_list[0], args_list[1],
+ args_list[2], args_list[3]);
}
}
else if (type == AXIOM_NAMESPACE)
{
status = axiom_xml_writer_write_namespace(om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ env,
+ args_list[0], args_list[1]);
}
else if (type == AXIOM_TEXT)
{
status = axiom_xml_writer_write_characters(om_output->xml_writer,
- env,
- args_list[0]);
+ env, args_list[0]);
}
else if (type == AXIOM_COMMENT)
{
status = axiom_xml_writer_write_comment(om_output->xml_writer,
- env,
- args_list[0]);
+ env, args_list[0]);
}
else if (type == AXIOM_PROCESSING_INSTRUCTION)
{
if (no_of_args == 1)
{
status =
- axiom_xml_writer_write_processing_instruction(
- om_output->xml_writer,
- env, args_list[0]);
+ axiom_xml_writer_write_processing_instruction(om_output->
+ xml_writer, env,
+ args_list[0]);
}
else if (no_of_args == 2)
{
- status = axiom_xml_writer_write_processing_instruction_data(
- om_output->xml_writer,
- env,
- args_list[0],
- args_list[1]);
+ status =
+ axiom_xml_writer_write_processing_instruction_data(om_output->
+ xml_writer,
+ env,
+ args_list[0],
+ args_list
+ [1]);
}
}
else if (type == AXIOM_DOCTYPE)
{
status = axiom_xml_writer_write_dtd(om_output->xml_writer,
- env,
- args_list[0]);
+ env, args_list[0]);
}
if (status == AXIS2_SUCCESS)
@@ -557,21 +577,27 @@
}
axis2_status_t AXIS2_CALL
-axiom_output_write_xml_version_encoding(axiom_output_t *om_output,
- const axutil_env_t *env)
+axiom_output_write_xml_version_encoding(
+ axiom_output_t * om_output,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axiom_xml_writer_write_start_document_with_version_encoding( om_output->xml_writer,
- env,
- om_output->xml_version,
- om_output->char_set_encoding);
+ return
+ axiom_xml_writer_write_start_document_with_version_encoding(om_output->
+ xml_writer,
+ env,
+ om_output->
+ xml_version,
+ om_output->
+ char_set_encoding);
}
axis2_byte_t *AXIS2_CALL
-axiom_output_flush(axiom_output_t *om_output,
- const axutil_env_t *env,
- axis2_byte_t **output_stream,
+axiom_output_flush(
+ axiom_output_t * om_output,
+ const axutil_env_t * env,
+ axis2_byte_t ** output_stream,
int *output_stream_size)
{
const axis2_char_t *soap_content_type = NULL;
@@ -580,10 +606,11 @@
if (om_output->do_optimize)
{
- axis2_byte_t* byte_stream = NULL;
+ axis2_byte_t *byte_stream = NULL;
axis2_char_t *root_content_id = NULL;
axis2_char_t *buffer =
- (axis2_char_t*)axiom_xml_writer_get_xml(om_output->xml_writer, env);
+ (axis2_char_t *) axiom_xml_writer_get_xml(om_output->xml_writer,
+ env);
int stream_size = 0;
if (om_output->is_soap11)
{
@@ -597,10 +624,12 @@
om_output->mime_boundry = axiom_output_get_mime_boundry(om_output, env);
root_content_id = axiom_output_get_root_content_id(om_output, env);
axiom_mime_output_complete(om_output->mime_output,
- env, &byte_stream, &stream_size,
- buffer, om_output->binary_node_list, om_output->mime_boundry,
- om_output->root_content_id, om_output->char_set_encoding,
- soap_content_type);
+ env, &byte_stream, &stream_size,
+ buffer, om_output->binary_node_list,
+ om_output->mime_boundry,
+ om_output->root_content_id,
+ om_output->char_set_encoding,
+ soap_content_type);
*output_stream = byte_stream;
*output_stream_size = stream_size;
@@ -609,4 +638,3 @@
}
return NULL;
}
-
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=580284&r1=580283&r2=580284&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 Fri Sep 28 03:22:20 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -21,14 +22,17 @@
struct axiom_processing_instruction
{
+
/** processing instruction target */
axis2_char_t *target;
+
/** processing instruction value */
axis2_char_t *value;
};
AXIS2_EXTERN axiom_processing_instruction_t *AXIS2_CALL
-axiom_processing_instruction_create(const axutil_env_t *env,
+axiom_processing_instruction_create(
+ const axutil_env_t * env,
axiom_node_t * parent,
const axis2_char_t * target,
const axis2_char_t * value,
@@ -40,7 +44,7 @@
if (!node || !target || !value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
@@ -52,9 +56,10 @@
return NULL;
}
- processing_instruction =
+ processing_instruction =
(axiom_processing_instruction_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_processing_instruction_t));
+ sizeof
+ (axiom_processing_instruction_t));
if (!processing_instruction)
{
@@ -66,11 +71,12 @@
if (value)
{
- processing_instruction->value = (axis2_char_t*)axutil_strdup(env, value);
+ processing_instruction->value =
+ (axis2_char_t *) axutil_strdup(env, value);
if (!processing_instruction->value)
{
AXIS2_FREE(env->allocator, processing_instruction);
- AXIS2_FREE(env->allocator , *node);
+ AXIS2_FREE(env->allocator, *node);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -80,7 +86,8 @@
if (target)
{
- processing_instruction->target = (axis2_char_t*) axutil_strdup(env, target);
+ processing_instruction->target =
+ (axis2_char_t *) axutil_strdup(env, target);
if (!processing_instruction->target)
{
AXIS2_FREE(env->allocator, processing_instruction->value);
@@ -101,8 +108,9 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_processing_instruction_free(axiom_processing_instruction_t *om_pi,
- const axutil_env_t *env)
+axiom_processing_instruction_free(
+ axiom_processing_instruction_t * om_pi,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -123,46 +131,49 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_processing_instruction_set_value(axiom_processing_instruction_t *om_pi,
- const axutil_env_t *env,
- const axis2_char_t *value)
+axiom_processing_instruction_set_value(
+ axiom_processing_instruction_t * om_pi,
+ const axutil_env_t * env,
+ const axis2_char_t * value)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
- om_pi->value = (axis2_char_t*)axutil_strdup(env, value);
+ om_pi->value = (axis2_char_t *) axutil_strdup(env, value);
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_processing_instruction_set_target(axiom_processing_instruction_t *om_pi,
- const axutil_env_t *env,
- const axis2_char_t *target)
+axiom_processing_instruction_set_target(
+ axiom_processing_instruction_t * om_pi,
+ const axutil_env_t * env,
+ const axis2_char_t * target)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, target, AXIS2_FAILURE);
- om_pi->target = (axis2_char_t*)axutil_strdup(env, target);
+ om_pi->target = (axis2_char_t *) axutil_strdup(env, target);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_processing_instruction_get_value(axiom_processing_instruction_t *om_pi,
- const axutil_env_t *env)
+axiom_processing_instruction_get_value(
+ axiom_processing_instruction_t * om_pi,
+ const axutil_env_t * env)
{
return om_pi->value;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_processing_instruction_get_target(axiom_processing_instruction_t *om_pi,
- const axutil_env_t *env)
+axiom_processing_instruction_get_target(
+ axiom_processing_instruction_t * om_pi,
+ const axutil_env_t * env)
{
return om_pi->target;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_processing_instruction_serialize(axiom_processing_instruction_t *om_pi,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_processing_instruction_serialize(
+ axiom_processing_instruction_t * om_pi,
+ const axutil_env_t * env,
+ axiom_output_t * om_output)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
@@ -170,15 +181,14 @@
if (om_pi->target && om_pi->value)
{
return axiom_output_write(om_output, env,
- AXIOM_PROCESSING_INSTRUCTION,
- 2, om_pi->target, om_pi->value);
+ AXIOM_PROCESSING_INSTRUCTION,
+ 2, om_pi->target, om_pi->value);
}
else if (om_pi->target)
{
return axiom_output_write(om_output, env,
- AXIOM_PROCESSING_INSTRUCTION,
- 2, om_pi->target, om_pi->value);
+ AXIOM_PROCESSING_INSTRUCTION,
+ 2, om_pi->target, om_pi->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