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 2005/10/24 03:32:09 UTC
svn commit: r327905 [2/3] - in /webservices/axis2/trunk/c: include/
modules/xml/om/src/ xdocs/api/
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c Sun Oct 23 18:31:44 2005
@@ -19,27 +19,67 @@
#include <axis2_om_namespace.h>
-axis2_om_namespace_t *
-axis2_om_element_impl_find_namespace (axis2_environment_t *environment, axis2_om_node_t
- *node, const axis2_char_t *uri,
- const axis2_char_t *prefix);
-axis2_status_t axis2_om_element_impl_declare_namespace(axis2_environment_t *environment, axis2_om_node_t *node, axis2_om_namespace_t *ns);
-axis2_om_namespace_t *
-axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *environment, axis2_om_node_t * element,
- axis2_qname_t * qname);
-
-axis2_om_namespace_t *axis2_om_element_impl_find_declared_namespace(axis2_environment_t *environment, struct axis2_om_element *element, const axis2_char_t *uri,const axis2_char_t *prefix);
-
-axis2_status_t axis2_om_element_impl_add_attribute(axis2_environment_t *environment, struct axis2_om_element *element, axis2_om_attribute_t *attribute);
-axis2_om_attribute_t *axis2_om_element_impl_get_attribute(axis2_environment_t *environment, struct axis2_om_element *element, axis2_qname_t *qname);
-axis2_status_t axis2_om_element_impl_free(axis2_environment_t *environment, struct axis2_om_element *element);
-axis2_status_t axis2_om_element_impl_serialize_start_part(axis2_environment_t *environment, axis2_om_element_t *element, axis2_om_output_t* om_output);
-axis2_status_t axis2_om_element_impl_serialize_end_part(axis2_environment_t *environment, axis2_om_element_t *element, axis2_om_output_t* om_output);
-
+axis2_om_namespace_t
+ *axis2_om_element_impl_find_namespace (axis2_environment_t * environment,
+ axis2_om_node_t * node,
+ const axis2_char_t * uri,
+ const axis2_char_t * prefix);
+axis2_status_t axis2_om_element_impl_declare_namespace (axis2_environment_t *
+ environment,
+ axis2_om_node_t *
+ node,
+ axis2_om_namespace_t *
+ ns);
+axis2_om_namespace_t
+ *axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *
+ environment,
+ axis2_om_node_t *
+ element,
+ axis2_qname_t * qname);
+
+axis2_om_namespace_t
+ *axis2_om_element_impl_find_declared_namespace (axis2_environment_t *
+ environment,
+ struct axis2_om_element
+ *element,
+ const axis2_char_t * uri,
+ const axis2_char_t *
+ prefix);
+
+axis2_status_t axis2_om_element_impl_add_attribute (axis2_environment_t *
+ environment,
+ struct axis2_om_element
+ *element,
+ axis2_om_attribute_t *
+ attribute);
+axis2_om_attribute_t *axis2_om_element_impl_get_attribute (axis2_environment_t
+ * environment,
+ struct
+ axis2_om_element
+ *element,
+ axis2_qname_t *
+ qname);
+axis2_status_t axis2_om_element_impl_free (axis2_environment_t * environment,
+ struct axis2_om_element *element);
+axis2_status_t axis2_om_element_impl_serialize_start_part (axis2_environment_t
+ * environment,
+ axis2_om_element_t
+ * element,
+ axis2_om_output_t *
+ om_output);
+axis2_status_t axis2_om_element_impl_serialize_end_part (axis2_environment_t *
+ environment,
+ axis2_om_element_t *
+ element,
+ axis2_om_output_t *
+ om_output);
+
axis2_om_element_t *
-axis2_om_element_create (axis2_environment_t *environment, axis2_om_node_t * parent,const axis2_char_t *localname,
- axis2_om_namespace_t * ns, axis2_om_node_t **node)
+axis2_om_element_create (axis2_environment_t * environment,
+ axis2_om_node_t * parent,
+ const axis2_char_t * localname,
+ axis2_om_namespace_t * ns, axis2_om_node_t ** node)
{
axis2_om_element_t *element;
if (!localname || !node)
@@ -48,13 +88,15 @@
return NULL;
}
- (*node) = axis2_om_node_create(environment);
+ (*node) = axis2_om_node_create (environment);
if (!(*node))
{
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
- element = (axis2_om_element_t *) axis2_malloc (environment->allocator, sizeof (axis2_om_element_t));
+ element =
+ (axis2_om_element_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_om_element_t));
if (!element)
{
@@ -66,11 +108,12 @@
element->localname = NULL;
element->attributes = NULL;
element->namespaces = NULL;
-
- element->localname = (char*)axis2_strdup (environment->string, localname);
+
+ element->localname =
+ (char *) axis2_strdup (environment->string, localname);
if (!element->localname)
{
- axis2_free(environment->allocator, element);
+ axis2_free (environment->allocator, element);
axis2_om_node_free (environment, (*node));
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
@@ -82,44 +125,58 @@
(*node)->parent = parent;
axis2_om_node_add_child (environment, parent, (*node));
}
-
+
(*node)->done = AXIS2_FALSE;
(*node)->node_type = AXIS2_OM_ELEMENT;
(*node)->data_element = element;
-
+
if (ns)
{
- element->ns = axis2_om_element_impl_find_namespace (environment, *node, ns->uri, ns->prefix);
+ element->ns =
+ axis2_om_element_impl_find_namespace (environment, *node, ns->uri,
+ ns->prefix);
if (!(element->ns))
{
- if (axis2_om_element_impl_declare_namespace(environment, *node, ns) == AXIS2_SUCCESS)
- element->ns = ns;
+ if (axis2_om_element_impl_declare_namespace
+ (environment, *node, ns) == AXIS2_SUCCESS)
+ element->ns = ns;
}
}
-
+
element->ops = NULL;
- element->ops = (axis2_om_element_ops_t*) axis2_malloc(environment->allocator, sizeof(axis2_om_element_ops_t));
-
+ element->ops =
+ (axis2_om_element_ops_t *) axis2_malloc (environment->allocator,
+ sizeof
+ (axis2_om_element_ops_t));
+
if (!element->ops)
{
- axis2_free(environment->allocator, element->localname);
- axis2_free(environment->allocator, element);
- axis2_om_node_free (environment, (*node));
+ axis2_free (environment->allocator, element->localname);
+ axis2_free (environment->allocator, element);
+ axis2_om_node_free (environment, (*node));
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
-
+
/* operations */
- element->ops->axis2_om_element_ops_find_namespace = axis2_om_element_impl_find_namespace;
- element->ops->axis2_om_element_ops_declare_namespace = axis2_om_element_impl_declare_namespace;
- element->ops->axis2_om_element_ops_find_namespace_with_qname = axis2_om_element_impl_find_namespace_with_qname;
- element->ops->axis2_om_element_ops_add_attribute = axis2_om_element_impl_add_attribute;
- element->ops->axis2_om_element_ops_get_attribute = axis2_om_element_impl_get_attribute;
+ element->ops->axis2_om_element_ops_find_namespace =
+ axis2_om_element_impl_find_namespace;
+ element->ops->axis2_om_element_ops_declare_namespace =
+ axis2_om_element_impl_declare_namespace;
+ element->ops->axis2_om_element_ops_find_namespace_with_qname =
+ axis2_om_element_impl_find_namespace_with_qname;
+ element->ops->axis2_om_element_ops_add_attribute =
+ axis2_om_element_impl_add_attribute;
+ element->ops->axis2_om_element_ops_get_attribute =
+ axis2_om_element_impl_get_attribute;
element->ops->axis2_om_element_ops_free = axis2_om_element_impl_free;
- element->ops->axis2_om_element_ops_find_declared_namespace = axis2_om_element_impl_find_declared_namespace;
- element->ops->axis2_om_element_ops_serialize_start_part = axis2_om_element_impl_serialize_start_part;
- element->ops->axis2_om_element_ops_serialize_end_part = axis2_om_element_impl_serialize_end_part;
-
+ element->ops->axis2_om_element_ops_find_declared_namespace =
+ axis2_om_element_impl_find_declared_namespace;
+ element->ops->axis2_om_element_ops_serialize_start_part =
+ axis2_om_element_impl_serialize_start_part;
+ element->ops->axis2_om_element_ops_serialize_end_part =
+ axis2_om_element_impl_serialize_end_part;
+
return element;
}
@@ -127,52 +184,60 @@
/* create an om_element using qname and parent */
axis2_om_element_t *
-axis2_om_element_create_with_qname (axis2_environment_t *environment, axis2_om_node_t * parent,
- axis2_qname_t * qname,axis2_om_node_t **node)
+axis2_om_element_create_with_qname (axis2_environment_t * environment,
+ axis2_om_node_t * parent,
+ axis2_qname_t * qname,
+ axis2_om_node_t ** node)
{
- axis2_om_element_t *element = NULL;
-
+ axis2_om_element_t *element = NULL;
+
if (!qname || !(*node))
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL; /* can't create an element */
}
-
+
/* TODO:handle namespace in the following */
- element = axis2_om_element_create (environment, parent,qname->localpart, NULL,node);
+ element =
+ axis2_om_element_create (environment, parent, qname->localpart, NULL,
+ node);
if (*node)
{
if (((axis2_om_element_t *) ((*node)->data_element))->ns)
{
- axis2_om_namespace_t *ns = ((axis2_om_element_t *) ((*node)->data_element))->ns;
- element->ns = axis2_om_element_impl_find_namespace (environment, *node, ns->uri, ns->prefix);
+ axis2_om_namespace_t *ns =
+ ((axis2_om_element_t *) ((*node)->data_element))->ns;
+ element->ns =
+ axis2_om_element_impl_find_namespace (environment, *node,
+ ns->uri, ns->prefix);
if (!(element->ns))
{
- if (axis2_om_element_impl_declare_namespace(environment, element, ns) == AXIS2_SUCCESS)
- element->ns = ns;
+ if (axis2_om_element_impl_declare_namespace
+ (environment, element, ns) == AXIS2_SUCCESS)
+ element->ns = ns;
}
}
}
-
+
return element;
}
axis2_om_namespace_t *
-axis2_om_element_impl_find_namespace (axis2_environment_t *environment, axis2_om_node_t
- *node, const axis2_char_t *uri,
- const axis2_char_t *prefix)
+axis2_om_element_impl_find_namespace (axis2_environment_t * environment,
+ axis2_om_node_t * node,
+ const axis2_char_t * uri,
+ const axis2_char_t * prefix)
{
void *ns = NULL;
axis2_hash_index_t *hashindex;
axis2_om_element_t *element = NULL;
-
+
if (!node)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- if (!(node->data_element)
- || node->node_type != AXIS2_OM_ELEMENT)
+ if (!(node->data_element) || node->node_type != AXIS2_OM_ELEMENT)
{
/* wrong element type or null node */
environment->error->errorno = AXIS2_ERROR_INVALID_NODE_TYPE;
@@ -186,58 +251,69 @@
hashindex; hashindex = axis2_hash_next (hashindex))
{
axis2_hash_this (hashindex, NULL, NULL, &ns);
- if (ns && axis2_strcmp (environment->string, ((axis2_om_namespace_t *) (ns))->uri, uri) == 0)
+ if (ns
+ && axis2_strcmp (environment->string,
+ ((axis2_om_namespace_t *) (ns))->uri,
+ uri) == 0)
{
- return (axis2_om_namespace_t*) (ns);
+ return (axis2_om_namespace_t *) (ns);
}
}
}
-
- if (element->namespaces)
- ns = axis2_hash_get (element->namespaces, prefix, AXIS2_HASH_KEY_STRING);
-
+
+ if (element->namespaces)
+ ns = axis2_hash_get (element->namespaces, prefix,
+ AXIS2_HASH_KEY_STRING);
+
if (ns)
{
return ns;
}
else if ((node->parent != NULL) &&
- (node->parent->node_type == AXIS2_OM_ELEMENT))
+ (node->parent->node_type == AXIS2_OM_ELEMENT))
{
- return axis2_om_element_impl_find_namespace (environment, node->parent, uri, prefix);
+ return axis2_om_element_impl_find_namespace (environment,
+ node->parent, uri,
+ prefix);
}
-
+
return NULL;
}
/* declare a namespace for this om element */
-axis2_status_t axis2_om_element_impl_declare_namespace(axis2_environment_t *environment, axis2_om_node_t *node, axis2_om_namespace_t *ns)
+axis2_status_t
+axis2_om_element_impl_declare_namespace (axis2_environment_t * environment,
+ axis2_om_node_t * node,
+ axis2_om_namespace_t * ns)
{
- axis2_om_namespace_t *declared_ns = NULL;
+ axis2_om_namespace_t *declared_ns = NULL;
axis2_om_element_t *element = NULL;
if (!node || !ns)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
- declared_ns = axis2_om_element_impl_find_namespace (environment, node, ns->uri, ns->prefix);
- if (declared_ns)
- {
- /*Namespace already declared, so return*/
- return AXIS2_SUCCESS;
- }
-
- element = (axis2_om_element_t*)(node->data_element);
-
- if (!element)
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ declared_ns =
+ axis2_om_element_impl_find_namespace (environment, node, ns->uri,
+ ns->prefix);
+
+ if (declared_ns)
+ {
+ /*Namespace already declared, so return */
+ return AXIS2_SUCCESS;
+ }
+
+ element = (axis2_om_element_t *) (node->data_element);
+
+ if (!element)
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
- }
-
+ }
+
if (!(element->namespaces))
{
element->namespaces = axis2_hash_make (environment);
@@ -246,9 +322,11 @@
}
if (ns->prefix)
- axis2_hash_set (element->namespaces, ns->prefix, AXIS2_HASH_KEY_STRING, ns);
+ axis2_hash_set (element->namespaces, ns->prefix,
+ AXIS2_HASH_KEY_STRING, ns);
else
- axis2_hash_set (element->namespaces, "default", AXIS2_HASH_KEY_STRING, ns);
+ axis2_hash_set (element->namespaces, "default", AXIS2_HASH_KEY_STRING,
+ ns);
return AXIS2_SUCCESS;
}
@@ -277,30 +355,38 @@
*/
-axis2_om_namespace_t *axis2_om_element_impl_find_declared_namespace(axis2_environment_t *environment, struct axis2_om_element *element, const axis2_char_t *uri,const axis2_char_t *prefix)
+axis2_om_namespace_t *
+axis2_om_element_impl_find_declared_namespace (axis2_environment_t *
+ environment,
+ struct axis2_om_element *
+ element,
+ const axis2_char_t * uri,
+ const axis2_char_t * prefix)
{
axis2_hash_index_t *hash_index = NULL;
- void *ns=NULL;
- if(!element || !(element->namespaces))
+ void *ns = NULL;
+ if (!element || !(element->namespaces))
{
return NULL;
- }
- if(!prefix || axis2_strcmp(environment->string,prefix,"") == 0)
+ }
+ if (!prefix || axis2_strcmp (environment->string, prefix, "") == 0)
{
- for (hash_index = axis2_hash_first (environment, element->namespaces);
+ for (hash_index = axis2_hash_first (environment, element->namespaces);
hash_index; hash_index = axis2_hash_next (hash_index))
{
axis2_hash_this (hash_index, NULL, NULL, &ns);
- if (axis2_strcmp (environment->string ,((axis2_om_namespace_t *) (ns))->uri, uri))
+ if (axis2_strcmp
+ (environment->string, ((axis2_om_namespace_t *) (ns))->uri,
+ uri))
{
return (axis2_om_namespace_t *) (ns);
}
}
return NULL;
}
- ns = axis2_hash_get(element->namespaces,prefix,AXIS2_HASH_KEY_STRING);
- if(ns)
- return (axis2_om_namespace_t*)ns;
+ ns = axis2_hash_get (element->namespaces, prefix, AXIS2_HASH_KEY_STRING);
+ if (ns)
+ return (axis2_om_namespace_t *) ns;
else
return NULL;
@@ -318,8 +404,10 @@
axis2_om_namespace_t *
-axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *environment, axis2_om_node_t * element,
- axis2_qname_t * qname)
+axis2_om_element_impl_find_namespace_with_qname (axis2_environment_t *
+ environment,
+ axis2_om_node_t * element,
+ axis2_qname_t * qname)
{
if (!element || !qname)
{
@@ -329,8 +417,9 @@
if (qname->namespace_uri)
{
- return axis2_om_element_impl_find_namespace (environment, element, qname->namespace_uri,
- qname->prefix);
+ return axis2_om_element_impl_find_namespace (environment, element,
+ qname->namespace_uri,
+ qname->prefix);
}
else
{
@@ -358,16 +447,19 @@
}
*/
-axis2_status_t axis2_om_element_impl_add_attribute(axis2_environment_t *environment, struct axis2_om_element *element, axis2_om_attribute_t *attribute)
+axis2_status_t
+axis2_om_element_impl_add_attribute (axis2_environment_t * environment,
+ struct axis2_om_element * element,
+ axis2_om_attribute_t * attribute)
{
axis2_qname_t *qname = NULL;
-
+
if (!element || !attribute)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
+
if (!(element->attributes))
{
element->attributes = axis2_hash_make (environment);
@@ -377,21 +469,26 @@
qname = axis2_om_attribute_get_qname (environment, attribute);
if (qname)
- axis2_hash_set (element->attributes, qname, sizeof (axis2_qname_t), attribute);
+ axis2_hash_set (element->attributes, qname, sizeof (axis2_qname_t),
+ attribute);
- return ((qname)?AXIS2_SUCCESS:AXIS2_FAILURE);
+ return ((qname) ? AXIS2_SUCCESS : AXIS2_FAILURE);
}
-axis2_om_attribute_t *axis2_om_element_impl_get_attribute(axis2_environment_t *environment, struct axis2_om_element *element, axis2_qname_t *qname)
+axis2_om_attribute_t *
+axis2_om_element_impl_get_attribute (axis2_environment_t * environment,
+ struct axis2_om_element * element,
+ axis2_qname_t * qname)
{
if (!element || !qname)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
-
- return (axis2_om_attribute_t*) (axis2_hash_get (element->attributes, qname,
- sizeof (axis2_qname_t)));
+
+ return (axis2_om_attribute_t
+ *) (axis2_hash_get (element->attributes, qname,
+ sizeof (axis2_qname_t)));
}
/*
@@ -439,14 +536,16 @@
}
*/
-axis2_status_t axis2_om_element_impl_free(axis2_environment_t *environment, struct axis2_om_element *element)
+axis2_status_t
+axis2_om_element_impl_free (axis2_environment_t * environment,
+ struct axis2_om_element *element)
{
if (!element)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
+
if (element)
{
if (element->localname)
@@ -455,17 +554,17 @@
}
if (element->ns)
{
- /* it is the responsibility of the element where the namespace is declared to free it*/
+ /* it is the responsibility of the element where the namespace is declared to free it */
}
if (element->attributes)
{
- /* TODO: free attributes*/
- /*need to eterate and free individual attributes*/
+ /* TODO: free attributes */
+ /*need to eterate and free individual attributes */
}
if (element->namespaces)
{
- /*TODO: free namespaces*/
- /*need to eterate and free individual namespaces*/
+ /*TODO: free namespaces */
+ /*need to eterate and free individual namespaces */
}
axis2_free (environment->allocator, element->ops);
axis2_free (environment->allocator, element);
@@ -502,7 +601,10 @@
}
*/
-axis2_status_t axis2_om_element_impl_serialize_start_part(axis2_environment_t *environment, axis2_om_element_t *element, axis2_om_output_t* om_output)
+axis2_status_t
+axis2_om_element_impl_serialize_start_part (axis2_environment_t * environment,
+ axis2_om_element_t * element,
+ axis2_om_output_t * om_output)
{
int status = AXIS2_SUCCESS;
if (!element || !om_output)
@@ -510,69 +612,83 @@
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
-
+
+
if (element->ns && element->ns->uri && element->ns->prefix)
- status = axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT, 3,
- element->localname, element->ns->uri,
- element->ns->prefix);
+ status =
+ axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT,
+ 3, element->localname, element->ns->uri,
+ element->ns->prefix);
else if (element->ns && element->ns->uri)
- status = axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT, 2,
- element->localname,
- element->ns->uri);
+ status =
+ axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT,
+ 2, element->localname, element->ns->uri);
else
- status = axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT, 1,
- element->localname);
+ status =
+ axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT,
+ 1, element->localname);
/* serialize attributes */
if (element->attributes)
{
axis2_hash_index_t *hi;
void *val;
- for (hi = axis2_hash_first(environment, element->attributes); hi; hi = axis2_hash_next(hi))
+ for (hi = axis2_hash_first (environment, element->attributes); hi;
+ hi = axis2_hash_next (hi))
{
- axis2_hash_this(hi, NULL, NULL, &val);
-
- if (val)
- status = axis2_om_attribute_serialize(environment, (axis2_om_attribute_t*)val, om_output);
+ axis2_hash_this (hi, NULL, NULL, &val);
+
+ if (val)
+ status =
+ axis2_om_attribute_serialize (environment,
+ (axis2_om_attribute_t *)
+ val, om_output);
else
{
status = AXIS2_FAILURE;
}
}
}
-
+
/* serialize namespaces */
if (element->namespaces)
{
axis2_hash_index_t *hi;
void *val;
- for (hi = axis2_hash_first(environment, element->namespaces); hi; hi = axis2_hash_next(hi))
+ for (hi = axis2_hash_first (environment, element->namespaces); hi;
+ hi = axis2_hash_next (hi))
{
- axis2_hash_this(hi, NULL, NULL, &val);
-
- if (val)
- status = axis2_om_namespace_serialize(environment, (axis2_om_namespace_t*)val, om_output);
+ axis2_hash_this (hi, NULL, NULL, &val);
+
+ if (val)
+ status =
+ axis2_om_namespace_serialize (environment,
+ (axis2_om_namespace_t *)
+ val, om_output);
else
{
status = AXIS2_FAILURE;
}
- }
+ }
}
-
+
return status;
}
-axis2_status_t axis2_om_element_impl_serialize_end_part(axis2_environment_t *environment, axis2_om_element_t *element, axis2_om_output_t* om_output)
+axis2_status_t
+axis2_om_element_impl_serialize_end_part (axis2_environment_t * environment,
+ axis2_om_element_t * element,
+ axis2_om_output_t * om_output)
{
int status = AXIS2_SUCCESS;
-
+
if (!om_output)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
- status = axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT, 0);
+
+ status =
+ axis2_om_output_write (environment, om_output, AXIS2_OM_ELEMENT, 0);
return status;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c Sun Oct 23 18:31:44 2005
@@ -16,126 +16,152 @@
#include <axis2_om_namespace.h>
-axis2_status_t axis2_om_namespace_impl_free(axis2_environment_t *environment, axis2_om_namespace_t *om_namespace);
-
-axis2_bool_t axis2_om_namespace_impl_equals(axis2_environment_t *environment, axis2_om_namespace_t *ns1, axis2_om_namespace_t *ns2);
-
-axis2_status_t axis2_om_namespace_impl_serialize(axis2_environment_t *environment, axis2_om_namespace_t *om_namespace, axis2_om_output_t* om_output);
-
-axis2_om_namespace_t *axis2_om_namespace_create(axis2_environment_t *environment,
- const axis2_char_t *uri, const axis2_char_t *prefix)
-
+axis2_status_t axis2_om_namespace_impl_free (axis2_environment_t *
+ environment,
+ axis2_om_namespace_t *
+ om_namespace);
+
+axis2_bool_t axis2_om_namespace_impl_equals (axis2_environment_t *
+ environment,
+ axis2_om_namespace_t * ns1,
+ axis2_om_namespace_t * ns2);
+
+axis2_status_t axis2_om_namespace_impl_serialize (axis2_environment_t *
+ environment,
+ axis2_om_namespace_t *
+ om_namespace,
+ axis2_om_output_t *
+ om_output);
+
+axis2_om_namespace_t *
+axis2_om_namespace_create (axis2_environment_t * environment,
+ const axis2_char_t * uri,
+ const axis2_char_t * prefix)
{
axis2_om_namespace_t *ns = NULL;
-
- if (!uri) /* there must be a URI */
+
+ if (!uri) /* there must be a URI */
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
-
- ns = (axis2_om_namespace_t*) axis2_malloc(environment->allocator,
- sizeof(axis2_om_namespace_t));
-
+
+ ns = (axis2_om_namespace_t *) axis2_malloc (environment->allocator,
+ sizeof
+ (axis2_om_namespace_t));
+
if (!ns)
{
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
- ns->uri = (axis2_char_t*)axis2_strdup(environment->string, uri);
+
+ ns->uri = (axis2_char_t *) axis2_strdup (environment->string, uri);
if (!ns->uri)
{
- axis2_free(environment->allocator, ns);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ axis2_free (environment->allocator, ns);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
+
ns->prefix = NULL;
if (prefix)
{
- ns->prefix = (axis2_char_t*)axis2_strdup(environment->string, prefix);
+ ns->prefix =
+ (axis2_char_t *) axis2_strdup (environment->string, prefix);
if (!ns->prefix)
{
- axis2_free(environment->allocator, ns);
- axis2_free(environment->allocator, ns->uri);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ axis2_free (environment->allocator, ns);
+ axis2_free (environment->allocator, ns->uri);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
- }
- }
-
+ }
+ }
+
/* operations */
ns->ops = NULL;
- ns->ops = (axis2_om_namespace_ops_t*) axis2_malloc(environment->allocator, sizeof(axis2_om_namespace_ops_t));
-
+ ns->ops =
+ (axis2_om_namespace_ops_t *) axis2_malloc (environment->allocator,
+ sizeof
+ (axis2_om_namespace_ops_t));
+
if (!ns->ops)
{
- axis2_free(environment->allocator, ns);
- axis2_free(environment->allocator, ns->uri);
- axis2_free(environment->allocator, ns->prefix);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ axis2_free (environment->allocator, ns);
+ axis2_free (environment->allocator, ns->uri);
+ axis2_free (environment->allocator, ns->prefix);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
+
ns->ops->axis2_om_namespace_ops_free = axis2_om_namespace_impl_free;
ns->ops->axis2_om_namespace_ops_equals = axis2_om_namespace_impl_equals;
- ns->ops->axis2_om_namespace_ops_serialize = axis2_om_namespace_impl_serialize;
-
+ ns->ops->axis2_om_namespace_ops_serialize =
+ axis2_om_namespace_impl_serialize;
+
return ns;
}
-axis2_status_t axis2_om_namespace_impl_free(axis2_environment_t *environment, struct axis2_om_namespace *om_namespace)
+axis2_status_t
+axis2_om_namespace_impl_free (axis2_environment_t * environment,
+ struct axis2_om_namespace * om_namespace)
{
if (om_namespace)
- {
- if(om_namespace->prefix)
- {
- axis2_free(environment->allocator, om_namespace->prefix);
+ {
+ if (om_namespace->prefix)
+ {
+ axis2_free (environment->allocator, om_namespace->prefix);
om_namespace->prefix = NULL;
- }
-
- if(om_namespace->uri)
- {
- axis2_free(environment->allocator, om_namespace->uri);
+ }
+
+ if (om_namespace->uri)
+ {
+ axis2_free (environment->allocator, om_namespace->uri);
om_namespace->uri = NULL;
- }
-
- if(om_namespace->ops)
- {
- axis2_free(environment->allocator, om_namespace->ops);
+ }
+
+ if (om_namespace->ops)
+ {
+ axis2_free (environment->allocator, om_namespace->ops);
om_namespace->ops = NULL;
- }
-
- axis2_free(environment->allocator, om_namespace);
- }
- return AXIS2_SUCCESS;
+ }
+
+ axis2_free (environment->allocator, om_namespace);
+ }
+ return AXIS2_SUCCESS;
}
-axis2_bool_t axis2_om_namespace_impl_equals(axis2_environment_t *environment, axis2_om_namespace_t * ns1,
- axis2_om_namespace_t * ns2)
+axis2_bool_t
+axis2_om_namespace_impl_equals (axis2_environment_t * environment,
+ axis2_om_namespace_t * ns1,
+ axis2_om_namespace_t * ns2)
{
int uris_differ = 0;
int prefixes_differ = 0;
if (!ns1 || !ns2)
- return AXIS2_FALSE;
+ return AXIS2_FALSE;
if (ns1->uri && ns2->uri)
- uris_differ = axis2_strcmp(environment->string, ns1->uri, ns2->uri);
+ uris_differ = axis2_strcmp (environment->string, ns1->uri, ns2->uri);
else
- uris_differ = (ns1->uri || ns2->uri);
+ uris_differ = (ns1->uri || ns2->uri);
if (ns1->prefix && ns2->prefix)
- prefixes_differ = axis2_strcmp(environment->string, ns1->prefix, ns2->prefix);
+ prefixes_differ =
+ axis2_strcmp (environment->string, ns1->prefix, ns2->prefix);
else
- prefixes_differ = (ns1->prefix || ns2->prefix);
+ prefixes_differ = (ns1->prefix || ns2->prefix);
return (!uris_differ && !prefixes_differ);
}
-axis2_status_t axis2_om_namespace_impl_serialize(axis2_environment_t *environment, axis2_om_namespace_t *om_namespace, axis2_om_output_t* om_output)
+axis2_status_t
+axis2_om_namespace_impl_serialize (axis2_environment_t * environment,
+ axis2_om_namespace_t * om_namespace,
+ axis2_om_output_t * om_output)
{
int status = AXIS2_SUCCESS;
if (!om_namespace || !om_output)
@@ -143,10 +169,12 @@
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
+
if (om_namespace->uri && om_namespace->prefix)
- status = axis2_om_output_write (environment, om_output, AXIS2_OM_NAMESPACE, 2,
- om_namespace->prefix, om_namespace->uri);
+ status =
+ axis2_om_output_write (environment, om_output, AXIS2_OM_NAMESPACE,
+ 2, om_namespace->prefix,
+ om_namespace->uri);
return status;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c Sun Oct 23 18:31:44 2005
@@ -18,43 +18,79 @@
#include <axis2_om_element.h>
#include <axis2_om_text.h>
-axis2_status_t axis2_om_node_impl_free(axis2_environment_t *environment,axis2_om_node_t * node);
-axis2_status_t axis2_om_node_impl_add_child(axis2_environment_t *environment,axis2_om_node_t * parent, axis2_om_node_t * child);
-axis2_om_node_t *axis2_om_node_impl_detach(axis2_environment_t *environment,axis2_om_node_t *node_to_detach);
-axis2_status_t axis2_om_node_impl_set_parent(axis2_environment_t *environment,axis2_om_node_t * node,axis2_om_node_t *parent);
-axis2_status_t axis2_om_node_impl_insert_sibling_after(axis2_environment_t *environment,axis2_om_node_t *node,axis2_om_node_t *node_to_insert);
-axis2_status_t axis2_om_node_impl_insert_sibling_before(axis2_environment_t *environment ,axis2_om_node_t *node,axis2_om_node_t *node_to_insert);
-axis2_om_node_t *axis2_om_node_impl_get_first_child(axis2_environment_t *environment,axis2_om_node_t *parent_node);
-axis2_om_node_t *axis2_om_node_impl_get_next_child(axis2_environment_t *environment,axis2_om_node_t *parent_node);
-axis2_status_t axis2_om_node_impl_serialize(axis2_environment_t *environment,axis2_om_node_t *om_node, axis2_om_output_t * om_output);
+axis2_status_t axis2_om_node_impl_free (axis2_environment_t * environment,
+ axis2_om_node_t * node);
+axis2_status_t axis2_om_node_impl_add_child (axis2_environment_t *
+ environment,
+ axis2_om_node_t * parent,
+ axis2_om_node_t * child);
+axis2_om_node_t *axis2_om_node_impl_detach (axis2_environment_t * environment,
+ axis2_om_node_t * node_to_detach);
+axis2_status_t axis2_om_node_impl_set_parent (axis2_environment_t *
+ environment,
+ axis2_om_node_t * node,
+ axis2_om_node_t * parent);
+axis2_status_t axis2_om_node_impl_insert_sibling_after (axis2_environment_t *
+ environment,
+ axis2_om_node_t *
+ node,
+ axis2_om_node_t *
+ node_to_insert);
+axis2_status_t axis2_om_node_impl_insert_sibling_before (axis2_environment_t *
+ environment,
+ axis2_om_node_t *
+ node,
+ axis2_om_node_t *
+ node_to_insert);
+axis2_om_node_t *axis2_om_node_impl_get_first_child (axis2_environment_t *
+ environment,
+ axis2_om_node_t *
+ parent_node);
+axis2_om_node_t *axis2_om_node_impl_get_next_child (axis2_environment_t *
+ environment,
+ axis2_om_node_t *
+ parent_node);
+axis2_status_t axis2_om_node_impl_serialize (axis2_environment_t *
+ environment,
+ axis2_om_node_t * om_node,
+ axis2_om_output_t * om_output);
-axis2_om_node_t *axis2_om_node_create(axis2_environment_t *environment)
+axis2_om_node_t *
+axis2_om_node_create (axis2_environment_t * environment)
{
- axis2_om_node_t *node = (axis2_om_node_t *)axis2_malloc(environment->allocator,sizeof(axis2_om_node_t));
- if (!node)
+ axis2_om_node_t *node =
+ (axis2_om_node_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_om_node_t));
+ if (!node)
{
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ return NULL;
}
- node->ops = (axis2_om_node_ops_t *)axis2_malloc(environment->allocator,sizeof(axis2_om_node_ops_t));
- if(!(node->ops))
+ node->ops =
+ (axis2_om_node_ops_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_om_node_ops_t));
+ if (!(node->ops))
{
- axis2_free(environment->allocator,node);
+ axis2_free (environment->allocator, node);
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
/* assign fucn pointers */
node->ops->axis2_om_node_ops_add_child = axis2_om_node_impl_add_child;
- node->ops->axis2_om_node_ops_free = axis2_om_node_impl_free;
- node->ops->axis2_om_node_ops_detach = axis2_om_node_impl_detach;
- node->ops->axis2_om_node_ops_get_first_child = axis2_om_node_impl_get_first_child;
- node->ops->axis2_om_node_ops_insert_sibling_after = axis2_om_node_impl_insert_sibling_after;
- node->ops->axis2_om_node_ops_insert_sibling_before = axis2_om_node_impl_insert_sibling_before;
+ node->ops->axis2_om_node_ops_free = axis2_om_node_impl_free;
+ node->ops->axis2_om_node_ops_detach = axis2_om_node_impl_detach;
+ node->ops->axis2_om_node_ops_get_first_child =
+ axis2_om_node_impl_get_first_child;
+ node->ops->axis2_om_node_ops_insert_sibling_after =
+ axis2_om_node_impl_insert_sibling_after;
+ node->ops->axis2_om_node_ops_insert_sibling_before =
+ axis2_om_node_impl_insert_sibling_before;
node->ops->axis2_om_node_ops_set_parent = axis2_om_node_impl_set_parent;
node->ops->axis2_om_node_ops_serialize = axis2_om_node_impl_serialize;
- node->ops->axis2_om_node_ops_get_next_child = axis2_om_node_impl_get_next_child;
-
+ node->ops->axis2_om_node_ops_get_next_child =
+ axis2_om_node_impl_get_next_child;
+
node->first_child = NULL;
node->last_child = NULL;
node->next_sibling = NULL;
@@ -63,7 +99,7 @@
node->node_type = AXIS2_OM_INVALID;
node->done = AXIS2_FALSE;
node->data_element = NULL;
- node->current_child = NULL;
+ node->current_child = NULL;
return node;
}
@@ -71,69 +107,73 @@
* This free fucntion will free an om_element and all the children contained in it
* before calling this function first free
*/
-axis2_status_t axis2_om_node_impl_free(axis2_environment_t *environment,axis2_om_node_t * node)
+axis2_status_t
+axis2_om_node_impl_free (axis2_environment_t * environment,
+ axis2_om_node_t * node)
{
-
- if(!node)
- {
+
+ if (!node)
+ {
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
- }
- if(node->first_child)
- {
- while(node->first_child)
+ }
+ if (node->first_child)
+ {
+ while (node->first_child)
{
axis2_om_node_t *node = NULL;
- node = axis2_om_node_detach(environment,node->first_child);
- axis2_om_node_free(environment,node);
+ node = axis2_om_node_detach (environment, node->first_child);
+ axis2_om_node_free (environment, node);
}
- }
- switch(node->node_type)
- {
- case AXIS2_OM_ELEMENT:
- /*axis2_om_element_free(environment,(axis2_om_element_t*)node->data_element) */
- break;
-
- case AXIS2_OM_COMMENT:
- /* axis2_om_comment_free(environment,(axis2_om_comment_t*)node->data_element) */
- break;
- case AXIS2_OM_DOCTYPE:
- /* axis2_om_doctype_free(environment,(axis2_om_doctype_t*)node->data_element) */
- break;
- case AXIS2_OM_PROCESSING_INSTRUCTION:
- /* axis2_om_prcessing_instruction_free(environment,(axis2_om_processing_instruction)node->data_element) */
- break;
- case AXIS2_OM_TEXT:
- /* axis2_om_text_free(environment,(axis2_om_text_t*)node->data_element); */
- break;
-
- default:
- break;
- }
-
- axis2_free(environment->allocator,node->ops);
- axis2_free(environment->allocator,node);
- return AXIS2_SUCCESS;
+ }
+ switch (node->node_type)
+ {
+ case AXIS2_OM_ELEMENT:
+ /*axis2_om_element_free(environment,(axis2_om_element_t*)node->data_element) */
+ break;
+
+ case AXIS2_OM_COMMENT:
+ /* axis2_om_comment_free(environment,(axis2_om_comment_t*)node->data_element) */
+ break;
+ case AXIS2_OM_DOCTYPE:
+ /* axis2_om_doctype_free(environment,(axis2_om_doctype_t*)node->data_element) */
+ break;
+ case AXIS2_OM_PROCESSING_INSTRUCTION:
+ /* axis2_om_prcessing_instruction_free(environment,(axis2_om_processing_instruction)node->data_element) */
+ break;
+ case AXIS2_OM_TEXT:
+ /* axis2_om_text_free(environment,(axis2_om_text_t*)node->data_element); */
+ break;
+
+ default:
+ break;
+ }
+
+ axis2_free (environment->allocator, node->ops);
+ axis2_free (environment->allocator, node);
+ return AXIS2_SUCCESS;
}
-axis2_status_t axis2_om_node_impl_add_child(axis2_environment_t *environment,
- axis2_om_node_t * parent, axis2_om_node_t * child)
+axis2_status_t
+axis2_om_node_impl_add_child (axis2_environment_t * environment,
+ axis2_om_node_t * parent,
+ axis2_om_node_t * child)
{
if (!parent || !child)
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return AXIS2_FAILURE;
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return AXIS2_FAILURE;
}
if (parent->first_child == NULL)
{
- parent->first_child = child;
+ parent->first_child = child;
}
else
{
- parent->last_child->next_sibling = child;
- child->prev_sibling = parent->last_child;
+ parent->last_child->next_sibling = child;
+ child->prev_sibling = parent->last_child;
}
-
+
child->parent = parent;
parent->last_child = child;
return AXIS2_SUCCESS;
@@ -141,7 +181,9 @@
-axis2_om_node_t *axis2_om_node_impl_detach(axis2_environment_t *environment,axis2_om_node_t *node_to_detach)
+axis2_om_node_t *
+axis2_om_node_impl_detach (axis2_environment_t * environment,
+ axis2_om_node_t * node_to_detach)
{
axis2_om_node_t *parent = NULL;
@@ -149,52 +191,55 @@
{
/* nodes that do not have a parent can't be detached */
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return NULL;
+ return NULL;
}
parent = node_to_detach->parent;
-
+
if ((node_to_detach->prev_sibling) == NULL)
{
- parent->first_child = node_to_detach->next_sibling;
- }
+ parent->first_child = node_to_detach->next_sibling;
+ }
else
{
- node_to_detach->prev_sibling->next_sibling =
- node_to_detach->next_sibling;
+ node_to_detach->prev_sibling->next_sibling =
+ node_to_detach->next_sibling;
}
if (!(node_to_detach->next_sibling))
{
- node_to_detach->next_sibling->prev_sibling =
- node_to_detach->prev_sibling;
+ node_to_detach->next_sibling->prev_sibling =
+ node_to_detach->prev_sibling;
}
node_to_detach->parent = NULL;
return node_to_detach;
}
-axis2_status_t axis2_om_node_impl_set_parent(axis2_environment_t *environment,axis2_om_node_t * node,axis2_om_node_t *parent)
+axis2_status_t
+axis2_om_node_impl_set_parent (axis2_environment_t * environment,
+ axis2_om_node_t * node,
+ axis2_om_node_t * parent)
{
- if(!parent || !node)
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return AXIS2_FAILURE;
- }
- if(parent == node->parent )
- {/* same parent already exist */
- return AXIS2_SUCCESS;
- }
- /* if a new parent is assigned in place of existing
- * one first the node should be detached
- */
-
- if(!(node->parent))
- {
- axis2_om_node_detach(environment,node);
-
- }
- node->parent = parent;
- return AXIS2_SUCCESS;
+ if (!parent || !node)
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return AXIS2_FAILURE;
+ }
+ if (parent == node->parent)
+ { /* same parent already exist */
+ return AXIS2_SUCCESS;
+ }
+ /* if a new parent is assigned in place of existing
+ * one first the node should be detached
+ */
+
+ if (!(node->parent))
+ {
+ axis2_om_node_detach (environment, node);
+
+ }
+ node->parent = parent;
+ return AXIS2_SUCCESS;
}
/**
@@ -202,142 +247,163 @@
* @param node the node in consideration
* @param nodeto_insert the node that will be inserted
*/
-
-axis2_status_t axis2_om_node_impl_insert_sibling_after(axis2_environment_t *environment,axis2_om_node_t *node,
- axis2_om_node_t *node_to_insert)
+
+axis2_status_t
+axis2_om_node_impl_insert_sibling_after (axis2_environment_t * environment,
+ axis2_om_node_t * node,
+ axis2_om_node_t * node_to_insert)
{
- if(!node || !node_to_insert )
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return AXIS2_FAILURE;
- }
- node_to_insert->parent = node->parent;
- node_to_insert->prev_sibling = node;
-
- if(node->next_sibling)
- {
- node->next_sibling->prev_sibling = node_to_insert;
- }
+ if (!node || !node_to_insert)
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return AXIS2_FAILURE;
+ }
+ node_to_insert->parent = node->parent;
+ node_to_insert->prev_sibling = node;
+
+ if (node->next_sibling)
+ {
+ node->next_sibling->prev_sibling = node_to_insert;
+ }
node_to_insert->next_sibling = node->next_sibling;
- node->next_sibling = node_to_insert;
- return AXIS2_SUCCESS;
+ node->next_sibling = node_to_insert;
+ return AXIS2_SUCCESS;
}
-axis2_status_t axis2_om_node_impl_insert_sibling_before(axis2_environment_t *environment
- ,axis2_om_node_t *node, axis2_om_node_t *node_to_insert)
+axis2_status_t
+axis2_om_node_impl_insert_sibling_before (axis2_environment_t * environment,
+ axis2_om_node_t * node,
+ axis2_om_node_t * node_to_insert)
{
- if(!node || !node_to_insert )
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return AXIS2_FAILURE;
- }
-
- node_to_insert->parent = node->parent;
-
- node_to_insert->prev_sibling = node->prev_sibling;
- node_to_insert->next_sibling = node;
-
- if(!(node->prev_sibling))
- {
- node->parent->first_child = node_to_insert;
- }
- else
- {
- node->prev_sibling->next_sibling = node_to_insert;
- }
- node->prev_sibling = node_to_insert;
- return AXIS2_SUCCESS;
+ if (!node || !node_to_insert)
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return AXIS2_FAILURE;
+ }
+
+ node_to_insert->parent = node->parent;
+
+ node_to_insert->prev_sibling = node->prev_sibling;
+ node_to_insert->next_sibling = node;
+
+ if (!(node->prev_sibling))
+ {
+ node->parent->first_child = node_to_insert;
+ }
+ else
+ {
+ node->prev_sibling->next_sibling = node_to_insert;
+ }
+ node->prev_sibling = node_to_insert;
+ return AXIS2_SUCCESS;
}
-axis2_om_node_t *axis2_om_node_impl_get_first_child(axis2_environment_t *environment
- ,axis2_om_node_t *parent_node)
+axis2_om_node_t *
+axis2_om_node_impl_get_first_child (axis2_environment_t * environment,
+ axis2_om_node_t * parent_node)
{
- /** */
- if(!parent_node)
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return NULL;
- }
- if(parent_node->first_child)
- {
- parent_node->current_child = parent_node->first_child;
- return parent_node->first_child;
- }
-
- return NULL;
+ /** */
+ if (!parent_node)
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return NULL;
+ }
+ if (parent_node->first_child)
+ {
+ parent_node->current_child = parent_node->first_child;
+ return parent_node->first_child;
+ }
+
+ return NULL;
}
-axis2_om_node_t *axis2_om_node_impl_get_next_child(axis2_environment_t *environment
- ,axis2_om_node_t *parent_node)
+axis2_om_node_t *
+axis2_om_node_impl_get_next_child (axis2_environment_t * environment,
+ axis2_om_node_t * parent_node)
{
- axis2_om_node_t *node=NULL;
- if(parent_node && !(parent_node->first_child))
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return NULL;
- }
-
- if(parent_node && parent_node->first_child && !(parent_node->current_child))
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_ITERATOR_STATE;
- return NULL;
- }
- if(parent_node->current_child->next_sibling)
- {
- node= parent_node->current_child->next_sibling;
- parent_node->current_child = node;
- return node;
- }
- return NULL;
+ axis2_om_node_t *node = NULL;
+ if (parent_node && !(parent_node->first_child))
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return NULL;
+ }
+
+ if (parent_node && parent_node->first_child
+ && !(parent_node->current_child))
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_ITERATOR_STATE;
+ return NULL;
+ }
+ if (parent_node->current_child->next_sibling)
+ {
+ node = parent_node->current_child->next_sibling;
+ parent_node->current_child = node;
+ return node;
+ }
+ return NULL;
}
-axis2_status_t axis2_om_node_impl_serialize(axis2_environment_t *environment, axis2_om_node_t *om_node, axis2_om_output_t * om_output)
+axis2_status_t
+axis2_om_node_impl_serialize (axis2_environment_t * environment,
+ axis2_om_node_t * om_node,
+ axis2_om_output_t * om_output)
{
- axis2_om_node_t *child_node = NULL;
+ axis2_om_node_t *child_node = NULL;
int status = AXIS2_SUCCESS;
-
+
if (!om_node || !om_output)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
-
+
+
switch (om_node->node_type)
{
- case AXIS2_OM_ELEMENT:
- status = axis2_om_element_serialize_start_part(environment, (axis2_om_element_t*)om_node->data_element, om_output );
- if (status != AXIS2_SUCCESS)
- return status;
- break;
- case AXIS2_OM_TEXT:
- status = axis2_om_text_serialize(environment, (axis2_om_text_t*)om_node->data_element, om_output );
+ case AXIS2_OM_ELEMENT:
+ status =
+ axis2_om_element_serialize_start_part (environment,
+ (axis2_om_element_t *)
+ om_node->data_element,
+ om_output);
+ if (status != AXIS2_SUCCESS)
return status;
- break;
+ break;
+ case AXIS2_OM_TEXT:
+ status =
+ axis2_om_text_serialize (environment,
+ (axis2_om_text_t *) om_node->
+ data_element, om_output);
+ return status;
+ break;
}
-
- child_node = axis2_om_node_get_first_child(environment,om_node);
+
+ child_node = axis2_om_node_get_first_child (environment, om_node);
while (child_node)
{
- status = axis2_om_node_serialize(environment, child_node, om_output);
- if (status != AXIS2_SUCCESS)
- return status;
- child_node = axis2_om_node_get_next_child(environment, om_node);
+ status = axis2_om_node_serialize (environment, child_node, om_output);
+ if (status != AXIS2_SUCCESS)
+ return status;
+ child_node = axis2_om_node_get_next_child (environment, om_node);
}
-
+
switch (om_node->node_type)
{
- case AXIS2_OM_ELEMENT:
- status = axis2_om_element_serialize_end_part(environment, (axis2_om_element_t*)om_node->data_element, om_output );
- if (status != AXIS2_SUCCESS)
- return status;
- break;
+ case AXIS2_OM_ELEMENT:
+ status =
+ axis2_om_element_serialize_end_part (environment,
+ (axis2_om_element_t *)
+ om_node->data_element,
+ om_output);
+ if (status != AXIS2_SUCCESS)
+ return status;
+ break;
}
-
+
return status;
-return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c Sun Oct 23 18:31:44 2005
@@ -19,23 +19,25 @@
#include <guththila_xml_stream_writer.h>
axis2_om_output_t *
-axis2_create_om_output (axis2_environment_t *environment, void* xml_writer)
+axis2_create_om_output (axis2_environment_t * environment, void *xml_writer)
{
axis2_om_output_t *om_output =
- (axis2_om_output_t *) axis2_malloc (environment->allocator, sizeof (axis2_om_output_t));
+ (axis2_om_output_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_om_output_t));
if (!om_output)
{
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
- om_output->xml_writer = NULL;
- if (xml_writer)
- om_output->xml_writer = xml_writer;
- else
- om_output->xml_writer = guththila_create_xml_stream_writer (stdout,
- DEFAULT_CHAR_SET_ENCODING, AXIS2_TRUE);
+
+ om_output->xml_writer = NULL;
+ if (xml_writer)
+ om_output->xml_writer = xml_writer;
+ else
+ om_output->xml_writer = guththila_create_xml_stream_writer (stdout,
+ DEFAULT_CHAR_SET_ENCODING,
+ AXIS2_TRUE);
om_output->do_optimize = AXIS2_FALSE;
om_output->mime_boundary = 0;
om_output->root_content_id = 0;
@@ -49,7 +51,8 @@
}
int
-axis2_om_output_write (axis2_environment_t *environment, axis2_om_output_t * om_output, axis2_om_types_t type,
+axis2_om_output_write (axis2_environment_t * environment,
+ axis2_om_output_t * om_output, axis2_om_types_t type,
int no_of_args, ...)
{
int status = AXIS2_SUCCESS;
@@ -73,20 +76,25 @@
switch (no_of_args)
{
case 0:
- status = guththila_xml_stream_writer_write_end_element (om_output->
- xml_writer);
+ status =
+ guththila_xml_stream_writer_write_end_element (om_output->
+ xml_writer);
break;
case 1:
- status = guththila_xml_stream_writer_write_start_element (om_output->
- xml_writer,
- args_list[0]);
+ status =
+ guththila_xml_stream_writer_write_start_element (om_output->
+ xml_writer,
+ args_list
+ [0]);
break;
case 2:
- status = guththila_xml_stream_writer_write_start_element_with_namespace
+ status =
+ guththila_xml_stream_writer_write_start_element_with_namespace
(om_output->xml_writer, args_list[0], args_list[1]);
break;
case 3:
- status = guththila_xml_stream_writer_write_start_element_with_namespace_prefix
+ status =
+ guththila_xml_stream_writer_write_start_element_with_namespace_prefix
(om_output->xml_writer, args_list[0], args_list[1],
args_list[2]);
break;
@@ -96,41 +104,58 @@
case AXIS2_OM_ATTRIBUTE:
switch (no_of_args)
{
- case 2:
- status = guththila_xml_stream_writer_write_attribute(om_output->xml_writer, args_list[0], args_list[1]);
- break;
- case 3:
- status = guththila_xml_stream_writer_write_attribute_with_namespace(om_output->xml_writer, args_list[0], args_list[1], args_list[2]);
- break;
- case 4:
- status = guththila_xml_stream_writer_write_attribute_with_namespace_prefix(om_output->xml_writer, args_list[0], args_list[1], args_list[2], args_list[3]);
- break;
+ case 2:
+ status =
+ guththila_xml_stream_writer_write_attribute (om_output->
+ xml_writer,
+ args_list[0],
+ args_list[1]);
+ break;
+ case 3:
+ status =
+ guththila_xml_stream_writer_write_attribute_with_namespace
+ (om_output->xml_writer, args_list[0], args_list[1],
+ args_list[2]);
+ break;
+ case 4:
+ status =
+ guththila_xml_stream_writer_write_attribute_with_namespace_prefix
+ (om_output->xml_writer, args_list[0], args_list[1],
+ args_list[2], args_list[3]);
+ break;
}
break;
- case AXIS2_OM_NAMESPACE:
- status = guththila_xml_stream_writer_write_namespace(om_output->xml_writer, args_list[0], args_list[1]);
- break;
- case AXIS2_OM_TEXT:
- status = guththila_xml_stream_writer_write_characters(om_output->xml_writer, args_list[0]);
- break;
- case AXIS2_OM_DOCUMENT:
- break;
- case AXIS2_OM_DOCTYPE:
- break;
- case AXIS2_OM_COMMENT:
- break;
- case AXIS2_OM_PROCESSING_INSTRUCTION:
- break;
- default:
- break;
+ case AXIS2_OM_NAMESPACE:
+ status =
+ guththila_xml_stream_writer_write_namespace (om_output->
+ xml_writer,
+ args_list[0],
+ args_list[1]);
+ break;
+ case AXIS2_OM_TEXT:
+ status =
+ guththila_xml_stream_writer_write_characters (om_output->
+ xml_writer,
+ args_list[0]);
+ break;
+ case AXIS2_OM_DOCUMENT:
+ break;
+ case AXIS2_OM_DOCTYPE:
+ break;
+ case AXIS2_OM_COMMENT:
+ break;
+ case AXIS2_OM_PROCESSING_INSTRUCTION:
+ break;
+ default:
+ break;
};
if (status == GUTHTHILA_SUCCESS)
{
return AXIS2_SUCCESS;
}
- else
+ else
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c Sun Oct 23 18:31:44 2005
@@ -13,60 +13,76 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <axis2_om_processing_instruction.h>
-axis2_status_t axis2_om_processing_instruction_impl_free(axis2_environment_t *environment, axis2_om_processing_instruction_t *processing_instruction);
+axis2_status_t axis2_om_processing_instruction_impl_free (axis2_environment_t
+ * environment,
+ axis2_om_processing_instruction_t
+ *
+ processing_instruction);
-axis2_om_processing_instruction_t *axis2_om_processing_instruction_create(axis2_environment_t *environment, axis2_om_node_t *parent,const axis2_char_t *target,const axis2_char_t *value, axis2_om_node_t **node)
+axis2_om_processing_instruction_t *
+axis2_om_processing_instruction_create (axis2_environment_t * environment,
+ axis2_om_node_t * parent,
+ const axis2_char_t * target,
+ const axis2_char_t * value,
+ axis2_om_node_t ** node)
{
axis2_om_processing_instruction_t *processing_instruction = NULL;
-
- if (!node || !target || !value)
+
+ if (!node || !target || !value)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- *node = axis2_om_node_create(environment);
+ *node = axis2_om_node_create (environment);
if (!*node)
{
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
- processing_instruction = (axis2_om_processing_instruction_t *) axis2_malloc(environment->allocator, sizeof(axis2_om_processing_instruction_t));
+
+ processing_instruction =
+ (axis2_om_processing_instruction_t *) axis2_malloc (environment->
+ allocator,
+ sizeof
+ (axis2_om_processing_instruction_t));
if (!processing_instruction)
{
- axis2_om_node_free(environment, *node);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ axis2_om_node_free (environment, *node);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
+
processing_instruction->value = NULL;
-
+
if (value)
{
- processing_instruction->value = axis2_strdup(environment->string, value);
+ processing_instruction->value =
+ axis2_strdup (environment->string, value);
if (!processing_instruction->value)
{
- axis2_free(environment->allocator, processing_instruction);
- axis2_om_node_free(environment, *node);
+ axis2_free (environment->allocator, processing_instruction);
+ axis2_om_node_free (environment, *node);
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
}
-
- processing_instruction->target = NULL;
-
+
+ processing_instruction->target = NULL;
+
if (target)
{
- processing_instruction->target = axis2_strdup(environment->string, target);
+ processing_instruction->target =
+ axis2_strdup (environment->string, target);
if (!processing_instruction->target)
{
- axis2_free(environment->allocator, processing_instruction->value);
- axis2_free(environment->allocator, processing_instruction);
- axis2_om_node_free(environment, *node);
+ axis2_free (environment->allocator,
+ processing_instruction->value);
+ axis2_free (environment->allocator, processing_instruction);
+ axis2_om_node_free (environment, *node);
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
@@ -74,45 +90,55 @@
(*node)->data_element = processing_instruction;
(*node)->node_type = AXIS2_OM_PROCESSING_INSTRUCTION;
-
- if (parent)
+
+ if (parent)
{
(*node)->parent = parent;
axis2_om_node_add_child (environment, parent, (*node));
}
-
+
/* operations */
processing_instruction->ops = NULL;
- processing_instruction->ops = (axis2_om_processing_instruction_ops_t*) axis2_malloc(environment->allocator, sizeof(axis2_om_processing_instruction_ops_t));
+ processing_instruction->ops =
+ (axis2_om_processing_instruction_ops_t *) axis2_malloc (environment->
+ allocator,
+ sizeof
+ (axis2_om_processing_instruction_ops_t));
if (!processing_instruction->ops)
{
- axis2_free(environment->allocator, processing_instruction->value);
- axis2_free(environment->allocator, processing_instruction->target);
- axis2_free(environment->allocator, processing_instruction);
- axis2_om_node_free(environment, *node);
+ axis2_free (environment->allocator, processing_instruction->value);
+ axis2_free (environment->allocator, processing_instruction->target);
+ axis2_free (environment->allocator, processing_instruction);
+ axis2_om_node_free (environment, *node);
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
-
- processing_instruction->ops->axis2_om_processing_instruction_ops_free = axis2_om_processing_instruction_impl_free;
-
+
+ processing_instruction->ops->axis2_om_processing_instruction_ops_free =
+ axis2_om_processing_instruction_impl_free;
+
return processing_instruction;
}
-axis2_status_t axis2_om_processing_instruction_impl_free(axis2_environment_t *environment, axis2_om_processing_instruction_t *processing_instruction)
+axis2_status_t
+axis2_om_processing_instruction_impl_free (axis2_environment_t * environment,
+ axis2_om_processing_instruction_t *
+ processing_instruction)
{
if (processing_instruction)
{
- if (processing_instruction->value)
- {
- axis2_free(environment->allocator, processing_instruction->value);
- }
-
- if (processing_instruction->target)
- {
- axis2_free(environment->allocator, processing_instruction->target);
- }
-
- axis2_free(environment->allocator, processing_instruction);
+ if (processing_instruction->value)
+ {
+ axis2_free (environment->allocator,
+ processing_instruction->value);
+ }
+
+ if (processing_instruction->target)
+ {
+ axis2_free (environment->allocator,
+ processing_instruction->target);
+ }
+
+ axis2_free (environment->allocator, processing_instruction);
}
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Sun Oct 23 18:31:44 2005
@@ -23,69 +23,80 @@
*/
/* operations */
-axis2_status_t axis2_om_text_impl_free(axis2_environment_t *environment, axis2_om_text_t *om_text);
-axis2_status_t axis2_om_text_impl_serialize(axis2_environment_t *environment, const axis2_om_text_t *om_text, axis2_om_output_t* om_output);
-
-axis2_om_text_t *axis2_om_text_create(axis2_environment_t *environment, axis2_om_node_t *parent,const axis2_char_t *value
- ,axis2_om_node_t **node)
+axis2_status_t axis2_om_text_impl_free (axis2_environment_t * environment,
+ axis2_om_text_t * om_text);
+axis2_status_t axis2_om_text_impl_serialize (axis2_environment_t *
+ environment,
+ const axis2_om_text_t * om_text,
+ axis2_om_output_t * om_output);
+
+axis2_om_text_t *
+axis2_om_text_create (axis2_environment_t * environment,
+ axis2_om_node_t * parent, const axis2_char_t * value,
+ axis2_om_node_t ** node)
{
-
+
axis2_om_text_t *om_text = NULL;
-
+
if (!node)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
-
- *node = axis2_om_node_create(environment);
-
+
+ *node = axis2_om_node_create (environment);
+
if (!(*node))
{
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
- om_text = (axis2_om_text_t*) axis2_malloc(environment->allocator, sizeof(axis2_om_text_t));
-
+
+ om_text =
+ (axis2_om_text_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_om_text_t));
+
if (!om_text)
{
- axis2_free(environment->allocator, *node);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ axis2_free (environment->allocator, *node);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
+
om_text->value = NULL;
if (value)
- om_text->value = (axis2_char_t*) axis2_strdup(environment->string, value);
-
+ om_text->value =
+ (axis2_char_t *) axis2_strdup (environment->string, value);
+
/* om_text->attribute = NULL; */
om_text->content_id = NULL;
om_text->mime_type = NULL;
-
+
(*node)->data_element = om_text;
(*node)->node_type = AXIS2_OM_TEXT;
(*node)->done = AXIS2_FALSE;
-
- if(parent && parent->node_type == AXIS2_OM_ELEMENT)
- {
- (*node)->parent = parent;
- axis2_om_node_add_child(environment, parent,*node);
- }
-
+
+ if (parent && parent->node_type == AXIS2_OM_ELEMENT)
+ {
+ (*node)->parent = parent;
+ axis2_om_node_add_child (environment, parent, *node);
+ }
+
/* operations */
om_text->ops = NULL;
- om_text->ops = (axis2_om_text_ops_t*) axis2_malloc(environment->allocator, sizeof(axis2_om_text_ops_t));
-
+ om_text->ops =
+ (axis2_om_text_ops_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_om_text_ops_t));
+
if (!om_text->ops)
{
- axis2_free(environment->allocator, *node);
- axis2_free(environment->allocator, om_text);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
+ axis2_free (environment->allocator, *node);
+ axis2_free (environment->allocator, om_text);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
-
+
om_text->ops->axis2_om_text_ops_free = axis2_om_text_impl_free;
om_text->ops->axis2_om_text_ops_serialize = axis2_om_text_impl_serialize;
@@ -93,27 +104,32 @@
}
-axis2_status_t axis2_om_text_impl_free(axis2_environment_t *environment, axis2_om_text_t *om_text)
+axis2_status_t
+axis2_om_text_impl_free (axis2_environment_t * environment,
+ axis2_om_text_t * om_text)
{
if (!om_text)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
+
if (om_text->value)
- axis2_free(environment->allocator, om_text->value);
-
+ axis2_free (environment->allocator, om_text->value);
+
if (om_text->ops)
- axis2_free(environment->allocator, om_text->ops);
-
+ axis2_free (environment->allocator, om_text->ops);
+
if (om_text)
- axis2_free(environment->allocator, om_text);
-
+ axis2_free (environment->allocator, om_text);
+
return AXIS2_SUCCESS;
}
-axis2_status_t axis2_om_text_impl_serialize(axis2_environment_t *environment, const axis2_om_text_t *om_text, axis2_om_output_t* om_output)
+axis2_status_t
+axis2_om_text_impl_serialize (axis2_environment_t * environment,
+ const axis2_om_text_t * om_text,
+ axis2_om_output_t * om_output)
{
int status = AXIS2_SUCCESS;
@@ -122,9 +138,10 @@
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
-
+
if (om_text->value)
- status = axis2_om_output_write (environment, om_output, AXIS2_OM_TEXT, 1,
- om_text->value);
+ status =
+ axis2_om_output_write (environment, om_output, AXIS2_OM_TEXT, 1,
+ om_text->value);
return status;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c?rev=327905&r1=327904&r2=327905&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c Sun Oct 23 18:31:44 2005
@@ -17,150 +17,168 @@
#include <axis2_qname.h>
#include <axis2_environment.h>
-axis2_status_t axis2_qname_impl_free(axis2_environment_t *environment,axis2_qname_t *qname);
-axis2_bool_t axis2_qname_impl_equals(axis2_environment_t *environment,axis2_qname_t *qn1,axis2_qname_t *qn2);
-axis2_qname_t *axis2_qname_create(axis2_environment_t *environment,const axis2_char_t *localpart,
- const axis2_char_t *namespace_uri, const axis2_char_t *prefix);
+axis2_status_t axis2_qname_impl_free (axis2_environment_t * environment,
+ axis2_qname_t * qname);
+axis2_bool_t axis2_qname_impl_equals (axis2_environment_t * environment,
+ axis2_qname_t * qn1,
+ axis2_qname_t * qn2);
+axis2_qname_t *axis2_qname_create (axis2_environment_t * environment,
+ const axis2_char_t * localpart,
+ const axis2_char_t * namespace_uri,
+ const axis2_char_t * prefix);
-axis2_status_t axis2_qname_impl_free(axis2_environment_t *environment,axis2_qname_t *qname)
+axis2_status_t
+axis2_qname_impl_free (axis2_environment_t * environment,
+ axis2_qname_t * qname)
{
- if (!qname)
- {
+ if (!qname)
+ {
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FAILURE;
}
- if(qname->localpart)
- {
- axis2_free(environment->allocator,qname->localpart);
- }
- if(qname->namespace_uri)
- {
- axis2_free(environment->allocator,qname->namespace_uri);
- }
- if(qname->prefix)
- {
- axis2_free(environment->allocator,qname->prefix);
- }
- if(qname->ops)
- {
- axis2_free(environment->allocator,qname->ops);
- }
- axis2_free(environment->allocator,qname);
- return AXIS2_SUCCESS;
-
+ if (qname->localpart)
+ {
+ axis2_free (environment->allocator, qname->localpart);
+ }
+ if (qname->namespace_uri)
+ {
+ axis2_free (environment->allocator, qname->namespace_uri);
+ }
+ if (qname->prefix)
+ {
+ axis2_free (environment->allocator, qname->prefix);
+ }
+ if (qname->ops)
+ {
+ axis2_free (environment->allocator, qname->ops);
+ }
+ axis2_free (environment->allocator, qname);
+ return AXIS2_SUCCESS;
+
}
-axis2_bool_t axis2_qname_impl_equals(axis2_environment_t *environment,axis2_qname_t *qn1,axis2_qname_t *qn2)
+axis2_bool_t
+axis2_qname_impl_equals (axis2_environment_t * environment,
+ axis2_qname_t * qn1, axis2_qname_t * qn2)
{
- int uris_differ = 0;
- int localparts_differ = 0;
-
- if(!qn1 || !qn2)
- {
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ int uris_differ = 0;
+ int localparts_differ = 0;
+
+ if (!qn1 || !qn2)
+ {
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FALSE;
- }
-
-
- if(qn1->localpart && qn2->localpart)
- {
- localparts_differ = axis2_strcmp(environment->string ,qn1->localpart , qn2->localpart);
- }
- else
- {
- localparts_differ = ((qn1->localpart) || (qn2->localpart));
- }
- if( qn1->namespace_uri && qn2->namespace_uri )
- {
- uris_differ = axis2_strcmp(environment->string, qn1->namespace_uri , qn2->namespace_uri );
- }
- else
- {
- uris_differ = ((qn1->namespace_uri) || (qn2->namespace_uri));
- }
- return (!uris_differ && !localparts_differ) ? AXIS2_TRUE : AXIS2_FALSE ;
+ }
+
+
+ if (qn1->localpart && qn2->localpart)
+ {
+ localparts_differ =
+ axis2_strcmp (environment->string, qn1->localpart,
+ qn2->localpart);
+ }
+ else
+ {
+ localparts_differ = ((qn1->localpart) || (qn2->localpart));
+ }
+ if (qn1->namespace_uri && qn2->namespace_uri)
+ {
+ uris_differ =
+ axis2_strcmp (environment->string, qn1->namespace_uri,
+ qn2->namespace_uri);
+ }
+ else
+ {
+ uris_differ = ((qn1->namespace_uri) || (qn2->namespace_uri));
+ }
+ return (!uris_differ && !localparts_differ) ? AXIS2_TRUE : AXIS2_FALSE;
}
-axis2_qname_t *axis2_qname_create(axis2_environment_t *environment,const axis2_char_t *localpart,
- const axis2_char_t *namespace_uri, const axis2_char_t *prefix)
+axis2_qname_t *
+axis2_qname_create (axis2_environment_t * environment,
+ const axis2_char_t * localpart,
+ const axis2_char_t * namespace_uri,
+ const axis2_char_t * prefix)
{
-
- axis2_qname_t *qn=NULL;
+
+ axis2_qname_t *qn = NULL;
/* localpart or prefix can't be null */
- if(!localpart)
+ if (!localpart)
{
environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
-
- qn = (axis2_qname_t *)axis2_malloc(environment->allocator,sizeof(axis2_qname_t));
+
+ qn = (axis2_qname_t *) axis2_malloc (environment->allocator,
+ sizeof (axis2_qname_t));
if (!qn)
{
- environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return NULL;
+ environment->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER;
+ return NULL;
+ }
+ /* set properties */
+
+ qn->localpart = axis2_strdup (environment->string, localpart);
+ if (!(qn->localpart))
+ {
+ axis2_free (environment->allocator, qn);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
+ }
+
+ if (!prefix)
+ {
+ qn->prefix = axis2_strdup (environment->string, "");
+ }
+ else
+ {
+ qn->prefix = axis2_strdup (environment->string, prefix);
+ }
+ if (!(qn->prefix))
+ {
+ axis2_free (environment->allocator, qn->localpart);
+ axis2_free (environment->allocator, qn);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
+ }
+ if (!namespace_uri)
+ {
+ qn->namespace_uri = axis2_strdup (environment->string, "");
+ }
+ else
+ {
+ qn->namespace_uri = axis2_strdup (environment->string, namespace_uri);
+ }
+ if (!(qn->namespace_uri))
+ {
+ axis2_free (environment->allocator, qn->localpart);
+ axis2_free (environment->allocator, qn->prefix);
+ axis2_free (environment->allocator, qn);
+ environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
+ return NULL;
}
- /* set properties */
-
- qn->localpart = axis2_strdup(environment->string,localpart);
- if(!(qn->localpart))
- {
- axis2_free(environment->allocator,qn);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
- }
-
- if(!prefix)
- {
- qn->prefix = axis2_strdup(environment->string,"");
- }
- else
- {
- qn->prefix = axis2_strdup(environment->string,prefix);
- }
- if(!(qn->prefix))
- {
- axis2_free(environment->allocator,qn->localpart);
- axis2_free(environment->allocator,qn);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
- }
- if(!namespace_uri)
- {
- qn->namespace_uri = axis2_strdup(environment->string,"");
- }
- else
- {
- qn->namespace_uri = axis2_strdup(environment->string,namespace_uri);
- }
- if(!(qn->namespace_uri))
- {
- axis2_free(environment->allocator,qn->localpart);
- axis2_free(environment->allocator,qn->prefix);
- axis2_free(environment->allocator,qn);
- environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
- return NULL;
- }
-
+
qn->ops = NULL;
- qn->ops = axis2_malloc(environment->allocator,sizeof(axis2_qname_ops_t));
+ qn->ops =
+ axis2_malloc (environment->allocator, sizeof (axis2_qname_ops_t));
/* operations */
- if(!qn->ops)
+ if (!qn->ops)
{
- axis2_free(environment->allocator,qn->localpart);
- if(qn->namespace_uri)
- axis2_free(environment->allocator,qn->namespace_uri);
- axis2_free(environment->allocator,qn->prefix);
- axis2_free(environment->allocator,qn);
+ axis2_free (environment->allocator, qn->localpart);
+ if (qn->namespace_uri)
+ axis2_free (environment->allocator, qn->namespace_uri);
+ axis2_free (environment->allocator, qn->prefix);
+ axis2_free (environment->allocator, qn);
environment->error->errorno = AXIS2_ERROR_NO_MEMORY;
return NULL;
- }
-
+ }
+
qn->ops->axis2_qname_ops_free = axis2_qname_impl_free;
- qn->ops->axis2_qname_ops_equals = axis2_qname_impl_equals;
+ qn->ops->axis2_qname_ops_equals = axis2_qname_impl_equals;
return qn;
}