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 [2/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_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.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,19 +22,24 @@
struct axiom_attribute
{
+
/** localname of this attribute */
axutil_string_t *localname;
+
/** value of this attribute */
axutil_string_t *value;
+
/** attribute namespace */
axiom_namespace_t *ns;
+
/** store qname here */
axutil_qname_t *qname;
int ref;
};
-AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
-axiom_attribute_create(const axutil_env_t *env,
+AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
+axiom_attribute_create(
+ const axutil_env_t * env,
const axis2_char_t * localname,
const axis2_char_t * value,
axiom_namespace_t * ns)
@@ -45,16 +51,17 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
attribute = (axiom_attribute_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_attribute_t));
+ sizeof(axiom_attribute_t));
if (!attribute)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+
/** initialize fields */
attribute->localname = NULL;
- attribute->value = NULL;
- attribute->ns = NULL;
+ attribute->value = NULL;
+ attribute->ns = NULL;
attribute->qname = NULL;
attribute->localname = axutil_string_create(env, localname);
@@ -69,7 +76,7 @@
attribute->value = axutil_string_create(env, value);
if (!(attribute->value))
{
- AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axutil_string_free(attribute->localname, env);
AXIS2_FREE(env->allocator, attribute);
return NULL;
@@ -82,10 +89,10 @@
return attribute;
}
-
AXIS2_EXTERN void AXIS2_CALL
-axiom_attribute_free(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+axiom_attribute_free(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
if (--attribute->ref > 0)
{
@@ -106,15 +113,16 @@
{
axutil_qname_free(attribute->qname, env);
}
-
+
AXIS2_FREE(env->allocator, attribute);
return;
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_attribute_free_void_arg(void *attribute,
- const axutil_env_t *env)
+axiom_attribute_free_void_arg(
+ void *attribute,
+ const axutil_env_t * env)
{
axiom_attribute_t *om_attribute_l = NULL;
@@ -125,8 +133,9 @@
}
AXIS2_EXTERN axutil_qname_t *AXIS2_CALL
-axiom_attribute_get_qname(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+axiom_attribute_get_qname(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
axutil_qname_t *qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -135,15 +144,21 @@
if (attribute->ns)
{
qname = axutil_qname_create(env,
- axutil_string_get_buffer(attribute->localname, env),
- axiom_namespace_get_uri(attribute->ns, env),
- axiom_namespace_get_prefix(attribute->ns, env));
+ axutil_string_get_buffer(attribute->
+ localname,
+ env),
+ axiom_namespace_get_uri(attribute->ns,
+ env),
+ axiom_namespace_get_prefix(attribute->
+ ns, env));
}
else
{
- qname = axutil_qname_create(env,
- axutil_string_get_buffer(attribute->localname, env),
- NULL, NULL);
+ qname = axutil_qname_create(env,
+ axutil_string_get_buffer(attribute->
+ localname,
+ env), NULL,
+ NULL);
}
attribute->qname = qname;
return qname;
@@ -152,9 +167,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_serialize(axiom_attribute_t *attribute,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_attribute_serialize(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env,
+ axiom_output_t * om_output)
{
int status = AXIS2_SUCCESS;
@@ -172,61 +188,74 @@
if ((uri) && (NULL != prefix) && (axutil_strcmp(prefix, "") != 0))
{
status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 4,
- axutil_string_get_buffer(attribute->localname, env),
- axutil_string_get_buffer(attribute->value, env),
- uri , prefix);
+ axutil_string_get_buffer(attribute->
+ localname,
+ env),
+ axutil_string_get_buffer(attribute->
+ value, env),
+ uri, prefix);
}
else if (uri)
{
status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 3,
- axutil_string_get_buffer(attribute->localname, env),
- axutil_string_get_buffer(attribute->value, env),
- uri);
+ axutil_string_get_buffer(attribute->
+ localname,
+ env),
+ axutil_string_get_buffer(attribute->
+ value, env),
+ uri);
}
}
else
{
status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 2,
- axutil_string_get_buffer(attribute->localname, env),
- axutil_string_get_buffer(attribute->value, env));
+ axutil_string_get_buffer(attribute->
+ localname, env),
+ axutil_string_get_buffer(attribute->value,
+ env));
}
return status;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_attribute_get_localname(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_attribute_get_localname(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
if (attribute->localname)
{
- return (axis2_char_t *)axutil_string_get_buffer(attribute->localname, env);
+ return (axis2_char_t *) axutil_string_get_buffer(attribute->localname,
+ env);
}
return NULL;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_attribute_get_value(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_attribute_get_value(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
if (attribute->value)
{
- return (axis2_char_t *)axutil_string_get_buffer(attribute->value, env);
+ return (axis2_char_t *) axutil_string_get_buffer(attribute->value, env);
}
return NULL;
}
-AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
-axiom_attribute_get_namespace(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
+axiom_attribute_get_namespace(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
return attribute->ns;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_set_localname(axiom_attribute_t *attribute,
- const axutil_env_t *env,
- const axis2_char_t *localname)
+axiom_attribute_set_localname(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env,
+ const axis2_char_t * localname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
@@ -249,9 +278,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_set_value(axiom_attribute_t *attribute,
- const axutil_env_t *env,
- const axis2_char_t *value)
+axiom_attribute_set_value(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env,
+ const axis2_char_t * value)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
@@ -272,9 +302,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_set_namespace(axiom_attribute_t *attribute,
- const axutil_env_t *env,
- axiom_namespace_t *om_namespace)
+axiom_attribute_set_namespace(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env,
+ axiom_namespace_t * om_namespace)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FUNC_PARAM_CHECK(om_namespace, env, AXIS2_FAILURE);
@@ -282,19 +313,20 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
-axiom_attribute_clone(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
+axiom_attribute_clone(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
- axiom_attribute_t *cloned_attr = NULL;
- if (!attribute) return NULL;
+ axiom_attribute_t *cloned_attr = NULL;
+ if (!attribute)
+ return NULL;
AXIS2_ENV_CHECK(env, NULL);
/** namespace is not cloned since it is a shollow copy*/
cloned_attr = axiom_attribute_create_str(env,
- attribute->localname,
- attribute->value,
- attribute->ns);
+ attribute->localname,
+ attribute->value, attribute->ns);
if (cloned_attr)
{
return cloned_attr;
@@ -302,17 +334,19 @@
return NULL;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_increment_ref(struct axiom_attribute *om_attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axiom_attribute_increment_ref(
+ struct axiom_attribute * om_attribute,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
om_attribute->ref++;
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axiom_attribute_t* AXIS2_CALL
-axiom_attribute_create_str(const axutil_env_t *env,
+AXIS2_EXTERN axiom_attribute_t *AXIS2_CALL
+axiom_attribute_create_str(
+ const axutil_env_t * env,
axutil_string_t * localname,
axutil_string_t * value,
axiom_namespace_t * ns)
@@ -324,16 +358,17 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
attribute = (axiom_attribute_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_attribute_t));
+ sizeof(axiom_attribute_t));
if (!attribute)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+
/** initialize fields */
attribute->localname = NULL;
- attribute->value = NULL;
- attribute->ns = NULL;
+ attribute->value = NULL;
+ attribute->ns = NULL;
attribute->qname = NULL;
attribute->localname = axutil_string_clone(localname, env);
@@ -348,7 +383,7 @@
attribute->value = axutil_string_clone(value, env);
if (!(attribute->value))
{
- AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axutil_string_free(attribute->localname, env);
AXIS2_FREE(env->allocator, attribute);
return NULL;
@@ -361,24 +396,27 @@
return attribute;
}
-AXIS2_EXTERN axutil_string_t* AXIS2_CALL
-axiom_attribute_get_localname_str(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
+axiom_attribute_get_localname_str(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
return attribute->localname;
}
-AXIS2_EXTERN axutil_string_t* AXIS2_CALL
-axiom_attribute_get_value_str(axiom_attribute_t *attribute,
- const axutil_env_t *env)
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
+axiom_attribute_get_value_str(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env)
{
return attribute->value;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_set_localname_str(axiom_attribute_t *attribute,
- const axutil_env_t *env,
- axutil_string_t *localname)
+axiom_attribute_set_localname_str(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env,
+ axutil_string_t * localname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
@@ -395,9 +433,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_attribute_set_value_str(axiom_attribute_t *attribute,
- const axutil_env_t *env,
- axutil_string_t *value)
+axiom_attribute_set_value_str(
+ axiom_attribute_t * attribute,
+ const axutil_env_t * env,
+ axutil_string_t * value)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.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
@@ -25,16 +26,17 @@
axis2_bool_t remove_called;
};
-AXIS2_EXTERN axiom_child_element_iterator_t * AXIS2_CALL
-axiom_child_element_iterator_create(const axutil_env_t *env,
- axiom_node_t *current_child)
+AXIS2_EXTERN axiom_child_element_iterator_t *AXIS2_CALL
+axiom_child_element_iterator_create(
+ const axutil_env_t * env,
+ axiom_node_t * current_child)
{
axiom_child_element_iterator_t *iterator = NULL;
AXIS2_ENV_CHECK(env, NULL);
- iterator = (axiom_child_element_iterator_t *)AXIS2_MALLOC(
- env->allocator,
- sizeof(axiom_child_element_iterator_t));
+ iterator = (axiom_child_element_iterator_t *) AXIS2_MALLOC(env->allocator,
+ sizeof
+ (axiom_child_element_iterator_t));
if (!iterator)
{
@@ -43,7 +45,7 @@
}
iterator->current_child = current_child;
- iterator->last_child = NULL;
+ iterator->last_child = NULL;
iterator->next_called = AXIS2_FALSE;
iterator->remove_called = AXIS2_FALSE;
@@ -51,21 +53,18 @@
return iterator;
}
-
-AXIS2_EXTERN void AXIS2_CALL
-axiom_child_element_iterator_free
-(void *iterator,
- const axutil_env_t *env)
+AXIS2_EXTERN void AXIS2_CALL axiom_child_element_iterator_free(
+ void *iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, iterator);
return;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_child_element_iterator_remove
-(axiom_child_element_iterator_t *iterator,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL axiom_child_element_iterator_remove(
+ axiom_child_element_iterator_t * iterator,
+ const axutil_env_t * env)
{
axiom_node_t *last_child = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -84,20 +83,18 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_child_element_iterator_has_next
-(axiom_child_element_iterator_t *iterator,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL axiom_child_element_iterator_has_next(
+ axiom_child_element_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return (iterator->current_child) ? AXIS2_TRUE : AXIS2_FALSE;
}
-AXIS2_EXTERN axiom_node_t* AXIS2_CALL
-axiom_child_element_iterator_next
-(axiom_child_element_iterator_t *iterator,
- const axutil_env_t *env)
+AXIS2_EXTERN axiom_node_t *AXIS2_CALL axiom_child_element_iterator_next(
+ axiom_child_element_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -108,14 +105,13 @@
iterator->last_child = iterator->current_child;
do
{
- iterator->current_child = axiom_node_get_next_sibling(
- iterator->current_child, env);
+ iterator->current_child =
+ axiom_node_get_next_sibling(iterator->current_child, env);
}
while (iterator->current_child &&
- (axiom_node_get_node_type(iterator->current_child, env)
- != AXIOM_ELEMENT));
-
+ (axiom_node_get_node_type(iterator->current_child, env)
+ != AXIOM_ELEMENT));
return iterator->last_child;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_iterator.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,15 +27,18 @@
axis2_bool_t remove_called;
};
-AXIS2_EXTERN axiom_children_iterator_t * AXIS2_CALL
-axiom_children_iterator_create(const axutil_env_t *env,
- axiom_node_t *current_child)
+AXIS2_EXTERN axiom_children_iterator_t *AXIS2_CALL
+axiom_children_iterator_create(
+ const axutil_env_t * env,
+ axiom_node_t * current_child)
{
axiom_children_iterator_t *iterator = NULL;
AXIS2_ENV_CHECK(env, NULL);
- iterator = (axiom_children_iterator_t *)AXIS2_MALLOC(
- env->allocator, sizeof(axiom_children_iterator_t));
+ iterator =
+ (axiom_children_iterator_t *) AXIS2_MALLOC(env->allocator,
+ sizeof
+ (axiom_children_iterator_t));
if (!iterator)
{
@@ -43,8 +47,8 @@
}
iterator->current_child = NULL;
- iterator->last_child = NULL;
- iterator->first_child = NULL;
+ iterator->last_child = NULL;
+ iterator->first_child = NULL;
iterator->next_called = AXIS2_FALSE;
iterator->remove_called = AXIS2_FALSE;
@@ -55,10 +59,10 @@
return iterator;
}
-
AXIS2_EXTERN void AXIS2_CALL
-axiom_children_iterator_free(axiom_children_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_iterator_free(
+ axiom_children_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -67,24 +71,25 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_children_iterator_remove(axiom_children_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_iterator_remove(
+ axiom_children_iterator_t * iterator,
+ const axutil_env_t * env)
{
axiom_node_t *om_node = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (!(iterator->next_called))
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
if (iterator->remove_called)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED,
- AXIS2_FAILURE);
+ AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
iterator->remove_called = AXIS2_TRUE;
@@ -102,8 +107,9 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_children_iterator_has_next(axiom_children_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_iterator_has_next(
+ axiom_children_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -111,8 +117,9 @@
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_children_iterator_next(axiom_children_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_iterator_next(
+ axiom_children_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -121,21 +128,20 @@
if (iterator->current_child)
{
iterator->last_child = iterator->current_child;
- iterator->current_child = axiom_node_get_next_sibling(
- iterator->current_child, env);
+ iterator->current_child =
+ axiom_node_get_next_sibling(iterator->current_child, env);
return iterator->last_child;
}
return NULL;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_children_iterator_reset(axiom_children_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_iterator_reset(
+ axiom_children_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
iterator->current_child = iterator->first_child;
return AXIS2_SUCCESS;
}
-
-
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.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
@@ -31,16 +32,19 @@
};
AXIS2_EXTERN axiom_children_qname_iterator_t *AXIS2_CALL
-axiom_children_qname_iterator_create(const axutil_env_t *env,
- axiom_node_t *current_child, axutil_qname_t *given_qname)
+axiom_children_qname_iterator_create(
+ const axutil_env_t * env,
+ axiom_node_t * current_child,
+ axutil_qname_t * given_qname)
{
axiom_children_qname_iterator_t *iterator = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, current_child, NULL);
- iterator = (axiom_children_qname_iterator_t*)AXIS2_MALLOC(env->allocator,
- sizeof(axiom_children_qname_iterator_t));
+ iterator = (axiom_children_qname_iterator_t *) AXIS2_MALLOC(env->allocator,
+ sizeof
+ (axiom_children_qname_iterator_t));
if (!iterator)
{
@@ -66,13 +70,14 @@
return NULL;
}
}
-
+
return iterator;
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_children_qname_iterator_free(axiom_children_qname_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_qname_iterator_free(
+ axiom_children_qname_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -85,22 +90,25 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_children_qname_iterator_remove(axiom_children_qname_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_qname_iterator_remove(
+ axiom_children_qname_iterator_t * iterator,
+ const axutil_env_t * env)
{
axiom_node_t *last_child = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (!(iterator->next_called))
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
if (iterator->remove_called)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED, AXIS2_FAILURE);
+ AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
iterator->remove_called = AXIS2_TRUE;
@@ -116,8 +124,9 @@
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axiom_children_qname_iterator_has_next(axiom_children_qname_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_qname_iterator_has_next(
+ axiom_children_qname_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -126,23 +135,27 @@
if (iterator->current_child)
{
axiom_element_t *om_element = NULL;
- if (axiom_node_get_node_type(iterator->current_child, env) == AXIOM_ELEMENT)
+ if (axiom_node_get_node_type(iterator->current_child, env) ==
+ AXIOM_ELEMENT)
{
- om_element = (axiom_element_t *)axiom_node_get_data_element(
- iterator->current_child, env);
+ om_element =
+ (axiom_element_t *) axiom_node_get_data_element(iterator->
+ current_child,
+ env);
}
if (om_element &&
- axutil_qname_equals(
- axiom_element_get_qname(om_element, env, iterator->current_child),
- env, iterator->given_qname))
+ axutil_qname_equals(axiom_element_get_qname
+ (om_element, env, iterator->current_child),
+ env, iterator->given_qname))
{
iterator->matching_node_found = AXIS2_TRUE;
iterator->need_to_move_forward = AXIS2_FALSE;
}
else
{
- iterator->current_child = axiom_node_get_next_sibling(iterator->current_child, env);
+ iterator->current_child =
+ axiom_node_get_next_sibling(iterator->current_child, env);
if (iterator->current_child)
{
iterator->need_to_move_forward = AXIS2_TRUE;
@@ -165,8 +178,9 @@
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_children_qname_iterator_next(axiom_children_qname_iterator_t *iterator,
- const axutil_env_t *env)
+axiom_children_qname_iterator_next(
+ axiom_children_qname_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -183,5 +197,3 @@
}
return iterator->last_child;
}
-
-
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.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
@@ -30,12 +31,12 @@
axis2_bool_t detach;
};
-AXIS2_EXTERN axiom_children_with_specific_attribute_iterator_t * AXIS2_CALL
+AXIS2_EXTERN axiom_children_with_specific_attribute_iterator_t *AXIS2_CALL
axiom_children_with_specific_attribute_iterator_create(
- const axutil_env_t *env,
- axiom_node_t *current_child,
- axutil_qname_t *attr_qname,
- axis2_char_t *attr_value,
+ const axutil_env_t * env,
+ axiom_node_t * current_child,
+ axutil_qname_t * attr_qname,
+ axis2_char_t * attr_value,
axis2_bool_t detach)
{
axiom_children_with_specific_attribute_iterator_t *iterator = NULL;
@@ -44,8 +45,8 @@
AXIS2_PARAM_CHECK(env->error, attr_qname, NULL);
AXIS2_PARAM_CHECK(env->error, attr_value, NULL);
iterator = (axiom_children_with_specific_attribute_iterator_t *)
- AXIS2_MALLOC(env->allocator,
- sizeof(axiom_children_with_specific_attribute_iterator_t));
+ AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_children_with_specific_attribute_iterator_t));
if (!iterator)
{
@@ -54,7 +55,7 @@
}
iterator->current_child = NULL;
- iterator->last_child = NULL;
+ iterator->last_child = NULL;
iterator->next_called = AXIS2_FALSE;
iterator->remove_called = AXIS2_FALSE;
@@ -66,11 +67,10 @@
return iterator;
}
-
AXIS2_EXTERN void AXIS2_CALL
axiom_children_with_specific_attribute_iterator_free(
- axiom_children_with_specific_attribute_iterator_t *iterator,
- const axutil_env_t *env)
+ axiom_children_with_specific_attribute_iterator_t * iterator,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
if (iterator->attr_qname)
@@ -83,8 +83,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_children_with_specific_attribute_iterator_remove(
- axiom_children_with_specific_attribute_iterator_t *iterator,
- const axutil_env_t *env)
+ axiom_children_with_specific_attribute_iterator_t * iterator,
+ const axutil_env_t * env)
{
axiom_node_t *last_child = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -92,13 +92,15 @@
if (!(iterator->next_called))
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED, AXIS2_FAILURE);
+ AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
if (iterator->remove_called)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED, AXIS2_FAILURE);
+ AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
iterator->remove_called = AXIS2_TRUE;
@@ -116,8 +118,8 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_children_with_specific_attribute_iterator_has_next(
- axiom_children_with_specific_attribute_iterator_t *iterator,
- const axutil_env_t *env)
+ axiom_children_with_specific_attribute_iterator_t * iterator,
+ const axutil_env_t * env)
{
axis2_bool_t matching_node_found = AXIS2_FALSE;
axis2_bool_t need_to_move_forward = AXIS2_TRUE;
@@ -130,18 +132,20 @@
while (need_to_move_forward)
{
if (axiom_node_get_node_type(iterator->current_child, env)
- == AXIOM_ELEMENT)
+ == AXIOM_ELEMENT)
{
axiom_attribute_t *om_attr = NULL;
axiom_element_t *om_ele = NULL;
- om_ele = (axiom_element_t *)axiom_node_get_data_element(
- iterator->current_child, env);
- om_attr = axiom_element_get_attribute(om_ele, env,
- iterator->attr_qname);
+ om_ele =
+ (axiom_element_t *) axiom_node_get_data_element(iterator->
+ current_child,
+ env);
+ om_attr =
+ axiom_element_get_attribute(om_ele, env, iterator->attr_qname);
break;
if (om_attr &&
- (axutil_strcmp(axiom_attribute_get_value(om_attr, env),
- iterator->attr_value) == 0))
+ (axutil_strcmp(axiom_attribute_get_value(om_attr, env),
+ iterator->attr_value) == 0))
{
matching_node_found = AXIS2_TRUE;
need_to_move_forward = AXIS2_FALSE;
@@ -149,8 +153,7 @@
else
{
iterator->current_child =
- axiom_node_get_next_sibling(
- iterator->current_child, env);
+ axiom_node_get_next_sibling(iterator->current_child, env);
need_to_move_forward = (iterator->current_child != NULL);
}
@@ -159,8 +162,7 @@
{
iterator->current_child =
- axiom_node_get_next_sibling(
- iterator->current_child, env);
+ axiom_node_get_next_sibling(iterator->current_child, env);
need_to_move_forward = (iterator->current_child != NULL);
}
@@ -168,10 +170,10 @@
return matching_node_found;
}
-AXIS2_EXTERN axiom_node_t* AXIS2_CALL
+AXIS2_EXTERN axiom_node_t *AXIS2_CALL
axiom_children_with_specific_attribute_iterator_next(
- axiom_children_with_specific_attribute_iterator_t *iterator,
- const axutil_env_t *env)
+ axiom_children_with_specific_attribute_iterator_t * iterator,
+ const axutil_env_t * env)
{
axiom_node_t *last_child = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -179,10 +181,10 @@
iterator->next_called = AXIS2_TRUE;
iterator->remove_called = AXIS2_FALSE;
iterator->last_child = iterator->current_child;
- iterator->current_child = axiom_node_get_next_sibling(
- iterator->current_child, env);
- if (iterator->last_child && iterator->detach
- && (axiom_node_get_parent(iterator->last_child, env)))
+ iterator->current_child =
+ axiom_node_get_next_sibling(iterator->current_child, env);
+ if (iterator->last_child && iterator->detach &&
+ (axiom_node_get_parent(iterator->last_child, env)))
{
last_child = axiom_node_detach(iterator->last_child, env);
if (last_child)
Modified: webservices/axis2/trunk/c/axiom/src/om/om_comment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_comment.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_comment.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,15 +22,17 @@
struct axiom_comment
{
+
/** comment text */
axis2_char_t *value;
};
AXIS2_EXTERN axiom_comment_t *AXIS2_CALL
-axiom_comment_create(const axutil_env_t *env,
- axiom_node_t *parent,
- const axis2_char_t *value,
- axiom_node_t **node)
+axiom_comment_create(
+ const axutil_env_t * env,
+ axiom_node_t * parent,
+ const axis2_char_t * value,
+ axiom_node_t ** node)
{
axiom_comment_t *comment = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -44,7 +47,7 @@
}
comment = (axiom_comment_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_comment_t));
+ sizeof(axiom_comment_t));
if (!comment)
{
AXIS2_FREE(env->allocator, (*node));
@@ -56,7 +59,7 @@
if (value)
{
- comment->value = (axis2_char_t*)axutil_strdup(env, value);
+ comment->value = (axis2_char_t *) axutil_strdup(env, value);
if (!comment->value)
{
AXIS2_FREE(env->allocator, comment);
@@ -78,8 +81,9 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_comment_free(axiom_comment_t *comment,
- const axutil_env_t *env)
+axiom_comment_free(
+ axiom_comment_t * comment,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -92,17 +96,19 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axiom_comment_get_value(axiom_comment_t *comment,
- const axutil_env_t *env)
+axiom_comment_get_value(
+ axiom_comment_t * comment,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
return comment->value;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_comment_set_value(axiom_comment_t *comment,
- const axutil_env_t *env,
- const axis2_char_t *value)
+axiom_comment_set_value(
+ axiom_comment_t * comment,
+ const axutil_env_t * env,
+ const axis2_char_t * value)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
@@ -111,7 +117,7 @@
AXIS2_FREE(env->allocator, comment->value);
}
- comment->value = (axis2_char_t*)axutil_strdup(env, value);
+ comment->value = (axis2_char_t *) axutil_strdup(env, value);
if (!comment->value)
{
@@ -122,19 +128,18 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_comment_serialize(axiom_comment_t *comment,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_comment_serialize(
+ axiom_comment_t * comment,
+ 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);
if (comment->value)
{
- return axiom_output_write(om_output, env,
- AXIOM_COMMENT , 1 , comment->value);
+ return axiom_output_write(om_output, env,
+ AXIOM_COMMENT, 1, comment->value);
}
return AXIS2_FAILURE;
}
-
-
Modified: webservices/axis2/trunk/c/axiom/src/om/om_data_source.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_data_source.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_data_source.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_data_source.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
@@ -25,19 +26,20 @@
#include <axiom_namespace.h>
#include <axutil_base64.h>
-
/********************* axiom_data_source_struct ***************/
struct axiom_data_source
{
+
/** stream holding serialized XML string */
axutil_stream_t *stream;
};
AXIS2_EXTERN axiom_data_source_t *AXIS2_CALL
-axiom_data_source_create(const axutil_env_t *env,
+axiom_data_source_create(
+ const axutil_env_t * env,
axiom_node_t * parent,
- axiom_node_t **node)
+ axiom_node_t ** node)
{
axiom_data_source_t *data_source = NULL;
@@ -52,20 +54,21 @@
return NULL;
}
data_source = (axiom_data_source_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_data_source_t));
+ sizeof
+ (axiom_data_source_t));
if (!data_source)
{
AXIS2_FREE(env->allocator, *node);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
+
axiom_node_set_data_element((*node), env, data_source);
axiom_node_set_node_type((*node), env, AXIOM_DATA_SOURCE);
axiom_node_set_complete((*node), env, AXIS2_FALSE);
data_source->stream = NULL;
-
+
data_source->stream = axutil_stream_create_basic(env);
if (!(data_source->stream))
{
@@ -74,7 +77,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
+
if (parent && axiom_node_get_node_type(parent, env) == AXIOM_ELEMENT)
{
axiom_node_add_child(parent, env, (*node));
@@ -84,8 +87,9 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_data_source_free(axiom_data_source_t * data_source,
- const axutil_env_t *env)
+axiom_data_source_free(
+ axiom_data_source_t * data_source,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -100,15 +104,15 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_data_source_serialize(axiom_data_source_t *data_source,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_data_source_serialize(
+ axiom_data_source_t * data_source,
+ const axutil_env_t * env,
+ axiom_output_t * om_output)
{
int status = AXIS2_SUCCESS;
axis2_char_t *data = NULL;
unsigned int data_len = 0;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
@@ -117,18 +121,16 @@
if (data)
{
data[data_len] = '\0';
- status = axiom_output_write(om_output, env,
- AXIOM_DATA_SOURCE, 1, data);
+ status = axiom_output_write(om_output, env, AXIOM_DATA_SOURCE, 1, data);
}
return status;
}
AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
-axiom_data_source_get_stream(axiom_data_source_t *data_source,
- const axutil_env_t *env)
+axiom_data_source_get_stream(
+ axiom_data_source_t * data_source,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
return data_source->stream;
}
-
-
Modified: webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_doctype.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_doctype.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,15 +22,17 @@
struct axiom_doctype
{
+
/** Doctype value */
axis2_char_t *value;
};
AXIS2_EXTERN axiom_doctype_t *AXIS2_CALL
-axiom_doctype_create(const axutil_env_t *env,
- axiom_node_t *parent,
- const axis2_char_t *value,
- axiom_node_t **node)
+axiom_doctype_create(
+ const axutil_env_t * env,
+ axiom_node_t * parent,
+ const axis2_char_t * value,
+ axiom_node_t ** node)
{
axiom_doctype_t *doctype = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -43,12 +46,12 @@
}
doctype = (axiom_doctype_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_doctype_t));
+ sizeof(axiom_doctype_t));
if (!doctype)
{
AXIS2_FREE(env->allocator, (*node));
- AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -56,7 +59,7 @@
if (value)
{
- doctype->value = (axis2_char_t*)axutil_strdup(env, value);
+ doctype->value = (axis2_char_t *) axutil_strdup(env, value);
if (!doctype->value)
{
AXIS2_FREE(env->allocator, doctype);
@@ -78,8 +81,9 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_doctype_free(axiom_doctype_t *om_doctype,
- const axutil_env_t *env)
+axiom_doctype_free(
+ axiom_doctype_t * om_doctype,
+ const axutil_env_t * env)
{
if (om_doctype)
{
@@ -93,37 +97,38 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_doctype_set_value(axiom_doctype_t *om_doctype,
- const axutil_env_t *env,
- const axis2_char_t *value)
+axiom_doctype_set_value(
+ axiom_doctype_t * om_doctype,
+ 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_doctype->value = (axis2_char_t*)axutil_strdup(env, value);
+ om_doctype->value = (axis2_char_t *) axutil_strdup(env, value);
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axiom_doctype_get_value(axiom_doctype_t *om_doctype,
- const axutil_env_t *env)
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+axiom_doctype_get_value(
+ axiom_doctype_t * om_doctype,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
return om_doctype->value;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_doctype_serialize(axiom_doctype_t *om_doctype,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_doctype_serialize(
+ axiom_doctype_t * om_doctype,
+ 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);
if (om_doctype->value)
- return axiom_output_write(om_output, env,
- AXIOM_DOCTYPE, 1, om_doctype->value);
+ return axiom_output_write(om_output, env,
+ AXIOM_DOCTYPE, 1, om_doctype->value);
return AXIS2_FAILURE;
}
-
-
Modified: webservices/axis2/trunk/c/axiom/src/om/om_document.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_document.c?rev=580284&r1=580283&r2=580284&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.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
@@ -15,40 +16,47 @@
* limitations under the License.
*/
-
#include <axiom_document.h>
#include <axiom_stax_builder.h>
#include <axutil_string.h>
struct axiom_document
{
+
/** root element */
axiom_node_t *root_element;
+
/** last child */
axiom_node_t *last_child;
+
/** first child */
axiom_node_t *first_child;
+
/** done building the document */
axis2_bool_t done;
+
/** builder of the document */
struct axiom_stax_builder *builder;
+
/** char set encoding */
axis2_char_t *char_set_encoding;
+
/** XML version */
axis2_char_t *xml_version;
};
AXIS2_EXTERN axiom_document_t *AXIS2_CALL
-axiom_document_create(const axutil_env_t *env,
- axiom_node_t *root,
- axiom_stax_builder_t *builder)
+axiom_document_create(
+ const axutil_env_t * env,
+ axiom_node_t * root,
+ axiom_stax_builder_t * builder)
{
axiom_document_t *document = NULL;
AXIS2_ENV_CHECK(env, NULL);
- document = (axiom_document_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_document_t));
+ document = (axiom_document_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_document_t));
if (!document)
{
@@ -68,8 +76,9 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_document_free(axiom_document_t *document,
- const axutil_env_t *env)
+axiom_document_free(
+ axiom_document_t * document,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -82,19 +91,20 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axiom_document_free_self(axiom_document_t *document,
- const axutil_env_t *env)
+axiom_document_free_self(
+ axiom_document_t * document,
+ const axutil_env_t * env)
{
AXIS2_FREE(env->allocator, document);
return;
}
-
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_document_build_next(axiom_document_t *document,
- const axutil_env_t *env)
+axiom_document_build_next(
+ axiom_document_t * document,
+ const axutil_env_t * env)
{
- axiom_node_t *last_child = NULL;
+ axiom_node_t *last_child = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -114,7 +124,8 @@
return last_child;
}
else if ((document->root_element) &&
- (axiom_node_is_complete(document->root_element, env) == AXIS2_TRUE))
+ (axiom_node_is_complete(document->root_element, env) ==
+ AXIS2_TRUE))
return NULL; /* Nothing wrong but done with pulling */
last_child = axiom_stax_builder_next(document->builder, env);
@@ -126,8 +137,9 @@
}
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
-axiom_document_get_root_element(axiom_document_t *document,
- const axutil_env_t *env)
+axiom_document_get_root_element(
+ axiom_document_t * document,
+ const axutil_env_t * env)
{
axiom_node_t *node = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -147,7 +159,8 @@
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL, AXIS2_FAILURE);
+ AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL,
+ AXIS2_FAILURE);
return NULL;
}
}
@@ -155,9 +168,10 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_document_set_root_element(axiom_document_t *document,
- const axutil_env_t *env,
- axiom_node_t *node)
+axiom_document_set_root_element(
+ axiom_document_t * document,
+ const axutil_env_t * env,
+ axiom_node_t * node)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
@@ -175,9 +189,10 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axiom_node_t* AXIS2_CALL
-axiom_document_build_all(struct axiom_document *document,
- const axutil_env_t *env)
+AXIS2_EXTERN axiom_node_t *AXIS2_CALL
+axiom_document_build_all(
+ struct axiom_document * document,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
if (!document)
@@ -196,13 +211,16 @@
ret_val = axiom_document_build_next(document, env);
if (!ret_val)
{
- if (axiom_node_is_complete(document->root_element, env) == AXIS2_TRUE)
+ if (axiom_node_is_complete(document->root_element, env) ==
+ AXIS2_TRUE)
{
+
/** document is completly build */
return document->root_element;
}
else
{
+
/** error occured */
return NULL;
}
@@ -215,18 +233,20 @@
return NULL;
}
-AXIS2_EXTERN axiom_stax_builder_t* AXIS2_CALL
-axiom_document_get_builder(axiom_document_t *document,
- const axutil_env_t *env)
+AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
+axiom_document_get_builder(
+ axiom_document_t * document,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
return document->builder;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axiom_document_serialize(axiom_document_t *document,
- const axutil_env_t *env,
- axiom_output_t *om_output)
+axiom_document_serialize(
+ axiom_document_t * document,
+ const axutil_env_t * env,
+ axiom_output_t * om_output)
{
if (!document)
return AXIS2_FAILURE;
@@ -238,13 +258,10 @@
}
if (document->root_element)
{
- return axiom_node_serialize(document->root_element,
- env, om_output);
+ return axiom_node_serialize(document->root_element, env, om_output);
}
else
{
return AXIS2_FAILURE;
}
}
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org