You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/01/25 07:13:25 UTC
svn commit: r372132 - in /webservices/axis2/trunk/c: include/
modules/xml/om/ modules/xml/soap/ test/xml/soap/
Author: nandika
Date: Tue Jan 24 22:13:10 2006
New Revision: 372132
URL: http://svn.apache.org/viewcvs?rev=372132&view=rev
Log:
warnings removed
Modified:
webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
webservices/axis2/trunk/c/modules/xml/om/om_node.c
webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c
webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c
webservices/axis2/trunk/c/test/xml/soap/test_soap.c
Modified: webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_stax_builder.h?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_stax_builder.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_stax_builder.h Tue Jan 24 22:13:10 2006
@@ -122,11 +122,10 @@
axis2_bool_t (AXIS2_CALL *is_complete)(struct axis2_om_stax_builder* builder,
axis2_env_t **env);
- axis2_om_node_t* (AXIS2_CALL *set_last_node)
+ axis2_status_t (AXIS2_CALL *set_last_node)
(struct axis2_om_stax_builder* builder,
axis2_env_t **env,
axis2_om_node_t *om_node);
-
int (AXIS2_CALL *get_element_level)(struct axis2_om_stax_builder* builder,
axis2_env_t **env);
@@ -137,7 +136,7 @@
int (AXIS2_CALL *next_with_token)(struct axis2_om_stax_builder *builder,
axis2_env_t **env);
-
+
} axis2_om_stax_builder_ops_t;
/**
Modified: webservices/axis2/trunk/c/modules/xml/om/om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_node.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_node.c Tue Jan 24 22:13:10 2006
@@ -791,4 +791,5 @@
AXIS2_INTF_TO_IMPL(om_node)->builder = builder;
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
+
Modified: webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c Tue Jan 24 22:13:10 2006
@@ -223,7 +223,6 @@
env , element_node, uri, prefix);
}
}
-
attr_name = AXIS2_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
builder_impl->parser, env, i);
@@ -442,10 +441,9 @@
axis2_om_stax_builder_create_om_element (axis2_om_stax_builder_t *om_stax_builder,
axis2_env_t **env)
{
- axis2_om_node_t *element_node;
+ axis2_om_node_t *element_node= NULL;
axis2_om_stax_builder_impl_t *builder_impl = NULL;
axis2_char_t *temp_localname = NULL;
- axis2_om_node_t *parent_node = NULL;
AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, NULL);
builder_impl = AXIS2_INTF_TO_IMPL(om_stax_builder);
@@ -491,7 +489,7 @@
AXIS2_OM_NODE_SET_NEXT_SIBLING(builder_impl->lastnode, env, element_node);
AXIS2_OM_NODE_SET_PREVIOUS_SIBLING(element_node , env, builder_impl->lastnode);
AXIS2_OM_NODE_SET_DOCUMENT(element_node, env, builder_impl->document);
- AXIS2_OM_NODE_SET_BUILDER(element_node, env, om_stax_builder);
+ AXIS2_OM_NODE_SET_BUILDER(element_node, env, om_stax_builder);
}
else
{
@@ -501,7 +499,7 @@
AXIS2_OM_NODE_SET_FIRST_CHILD(builder_impl->lastnode , env, element_node);
AXIS2_OM_NODE_SET_PARENT(element_node , env, builder_impl->lastnode);
AXIS2_OM_NODE_SET_DOCUMENT(element_node, env, builder_impl->document);
- AXIS2_OM_NODE_SET_BUILDER(element_node, env, om_stax_builder);
+ AXIS2_OM_NODE_SET_BUILDER(element_node, env, om_stax_builder);
}
AXIS2_XML_READER_XML_FREE(builder_impl->parser , env, temp_localname);
@@ -585,10 +583,8 @@
axis2_om_doctype_create(env, NULL, doc_value, &doctype_node);
AXIS2_OM_DOCUMENT_SET_ROOT_ELEMENT(builder_impl->document, env,
doctype_node);
-
}
builder_impl->lastnode = doctype_node;
-
AXIS2_XML_READER_XML_FREE(builder_impl->parser, env, doc_value);
return doctype_node;
}
@@ -598,7 +594,7 @@
axis2_om_stax_builder_create_om_processing_instruction (axis2_om_stax_builder_t *builder,
axis2_env_t **env)
{
- axis2_om_node_t *pi_node;
+ axis2_om_node_t *pi_node = NULL;
axis2_om_stax_builder_impl_t *builder_impl = NULL;
axis2_char_t *target = NULL;
axis2_char_t *value = NULL;
@@ -613,7 +609,6 @@
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
return NULL;
}
-
if (!(builder_impl->lastnode))
{
/* do nothing */
@@ -635,7 +630,6 @@
{
axis2_om_processing_instruction_create( env, builder_impl->lastnode,
target, value, &pi_node);
-
AXIS2_OM_NODE_SET_FIRST_CHILD(builder_impl->lastnode , env, pi_node);
AXIS2_OM_NODE_SET_PARENT(pi_node , env, builder_impl->lastnode);
}
@@ -813,11 +807,9 @@
axis2_env_t **env,
axis2_om_document_t *document)
{
-
AXIS2_FUNC_PARAM_CHECK(builder,env,AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, document , AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(builder)->document = document ;
-
return AXIS2_SUCCESS;
}
@@ -830,7 +822,7 @@
}
-axis2_om_node_t* AXIS2_CALL
+axis2_om_node_t* AXIS2_CALL
axis2_om_stax_builder_get_lastnode(axis2_om_stax_builder_t *builder,
axis2_env_t **env)
{
@@ -895,25 +887,23 @@
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL, AXIS2_FAILURE);
return -1;
}
+ token = AXIS2_XML_READER_NEXT (builder_impl->parser, env);
+ if(token == -1)
+ {
+ builder_impl->done = AXIS2_TRUE;
+ return -1;
+ }
+
+ if (!(builder_impl->cache))
+ {
+ return -1;
+ }
- token = AXIS2_XML_READER_NEXT (builder_impl->parser, env);
- if(token == -1)
- {
- builder_impl->done = AXIS2_TRUE;
- return -1;
- }
-
- if (!(builder_impl->cache))
- {
- return -1;
- }
-
-
- switch (token)
- {
+ switch (token)
+ {
case AXIS2_XML_READER_START_DOCUMENT:
- /*Do nothing */
- break;
+ /*Do nothing */
+ break;
case AXIS2_XML_READER_START_ELEMENT:
axis2_om_stax_builder_create_om_element (
@@ -941,30 +931,25 @@
break;
case AXIS2_XML_READER_COMMENT:
-
- axis2_om_stax_builder_create_om_comment(builder, env);
- axis2_om_stax_builder_end_element (builder, env);
-
+ axis2_om_stax_builder_create_om_comment(builder, env);
+ axis2_om_stax_builder_end_element (builder, env);
break;
case AXIS2_XML_READER_PROCESSING_INSTRUCTION:
-
- axis2_om_stax_builder_create_om_processing_instruction(
+ axis2_om_stax_builder_create_om_processing_instruction(
builder , env );
axis2_om_stax_builder_end_element (builder, env);
-
break;
case AXIS2_XML_READER_CDATA:
break;
case AXIS2_XML_READER_DOCUMENT_TYPE:
- /* node = axis2_om_stax_builder_create_om_doctype(om_stax_builder, env);
- */
break;
default:
break;
- }
+ }
return token;
-}
\ No newline at end of file
+}
+
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c Tue Jan 24 22:13:10 2006
@@ -217,7 +217,6 @@
builder_impl->soap_builder.ops->get_soap_version =
axis2_soap_builder_get_soap_version;
status = identify_soap_version(&(builder_impl->soap_builder), env, soap_version);
- printf(" \nbuilder soap version %d \n", builder_impl->soap_version);
if(status == AXIS2_FAILURE)
{
axis2_soap_builder_free(&(builder_impl->soap_builder), env);
@@ -652,7 +651,6 @@
builder_impl = AXIS2_INTF_TO_IMPL(builder);
soap_header = AXIS2_SOAP_ENVELOPE_GET_HEADER(builder_impl->soap_envelope, env);
om_node = AXIS2_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
-
if(soap_header)
{
while(!AXIS2_OM_NODE_GET_BUILD_STATUS(om_node, env))
@@ -660,7 +658,6 @@
status = axis2_soap_builder_next(builder, env);
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;
-
}
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Tue Jan 24 22:13:10 2006
@@ -31,15 +31,15 @@
typedef struct axis2_soap_envelope_impl_t
{
axis2_soap_envelope_t soap_envelope;
-
+ /* corresponding om element node */
axis2_om_node_t *om_ele_node;
-
+ /* soap version */
int soap_version;
-
+ /* soap header */
axis2_soap_header_t *header;
-
+ /* soap body */
axis2_soap_body_t *body;
-
+ /* pointer to soap builder */
axis2_soap_builder_t *soap_builder;
}axis2_soap_envelope_impl_t;
@@ -169,10 +169,6 @@
envelope_impl->soap_envelope.ops->serialize =
axis2_soap_envelope_serialize;
-
-
-
-
return &(envelope_impl->soap_envelope);
}
@@ -235,7 +231,6 @@
envelope_impl->soap_envelope.ops->set_builder =
axis2_soap_envelope_set_builder;
-
return &(envelope_impl->soap_envelope);
}
@@ -288,9 +283,7 @@
axis2_soap_envelope_impl_t *envelope_impl = NULL;
AXIS2_FUNC_PARAM_CHECK( envelope, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
-
envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
-
if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
@@ -336,29 +329,28 @@
axis2_env_t **env)
{
axis2_soap_envelope_impl_t *envelope_impl = NULL;
- axis2_qname_t *header_qn = NULL;
- axis2_om_node_t *header_node = NULL;
- axis2_om_element_t *header_ele = NULL;
- axis2_om_element_t *envelope_ele = NULL;
int status = AXIS2_SUCCESS;
-
AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
-
if(envelope_impl->header)
{
return envelope_impl->header;
}
- if(envelope_impl->soap_builder)
+ else if(envelope_impl->soap_builder)
{
while(!(envelope_impl->header) && !AXIS2_OM_NODE_GET_BUILD_STATUS(envelope_impl->om_ele_node, env))
{
status = AXIS2_SOAP_BUILDER_NEXT(envelope_impl->soap_builder, env);
if(status == AXIS2_FAILURE)
- return NULL;
+ break;
}
}
/*
+ axis2_qname_t *header_qn = NULL;
+ axis2_om_node_t *header_node = NULL;
+ axis2_om_element_t *header_ele = NULL;
+ axis2_om_element_t *envelope_ele = NULL;
+
else
{
envelope_impl->header = axis2_soap_header_create(env);
@@ -385,7 +377,7 @@
if(envelope_impl->header)
return envelope_impl->header;
}
- */
+
if(!(envelope_impl->header))
{
envelope_impl->header = axis2_soap_header_create_with_parent(env, envelope);
@@ -398,6 +390,7 @@
AXIS2_SOAP_HEADER_SET_SOAP_VERSION(envelope_impl->header, env, AXIS2_SOAP12);
}
}
+ */
return envelope_impl->header;
}
@@ -445,13 +438,7 @@
axis2_env_t **env)
{
axis2_soap_envelope_impl_t *envelope_impl = NULL;
- axis2_om_element_t *envelope_ele = NULL;
- axis2_om_node_t *first_node = NULL;
- axis2_om_element_t *first_ele = NULL;
int status = AXIS2_SUCCESS;
- axis2_om_node_t *next_node = NULL;
- axis2_om_element_t *next_ele = NULL;
-
AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
@@ -466,7 +453,7 @@
status = AXIS2_SOAP_BUILDER_NEXT(envelope_impl->soap_builder, env);
if(status == AXIS2_FAILURE)
{
- return NULL;
+ break;
}
}
if(envelope_impl->body)
@@ -474,6 +461,12 @@
}
/*
+
+ axis2_om_element_t *envelope_ele = NULL;
+ axis2_om_node_t *first_node = NULL;
+ axis2_om_element_t *first_ele = NULL;
+ axis2_om_node_t *next_node = NULL;
+ axis2_om_element_t *next_ele = NULL;
envelope_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(
envelope_impl->om_ele_node, env);
@@ -531,7 +524,7 @@
/* TODO
if (!omOutput.isIgnoreXMLDeclaration()) {
- axis2_char_t *charSetEncoding = omOutput.getCharSetEncoding();
+ ax is2_char_t *charSetEncoding = omOutput.getCharSetEncoding();
axis2_char_t *xmlVersion = omOutput.getXmlVersion();
omOutput.getXmlStreamWriter().writeStartDocument(charSetEncoding == null ?
OMConstants.DEFAULT_CHAR_SET_ENCODING : charSetEncoding,
@@ -544,9 +537,6 @@
if(soap_body)
{
axis2_soap_fault_t *soap_fault = NULL;
- axis2_om_node_t *soap_fault_om_node = NULL;
- axis2_om_element_t *soap_fault_om_ele = NULL;
-
if(AXIS2_SOAP_BODY_HAS_FAULT(soap_body, env))
{
soap_fault = AXIS2_SOAP_BODY_GET_FAULT(soap_body, env);
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c Tue Jan 24 22:13:10 2006
@@ -31,27 +31,24 @@
typedef struct axis2_soap_fault_impl_t
{
axis2_soap_fault_t soap_fault;
-
+ /* om element node corresponding to soap fault */
axis2_om_node_t *om_ele_node;
- axis2_om_element_t *om_ele;
-
- axis2_soap_body_t *parent;
-
+ /* soap fault code sub element */
axis2_soap_fault_code_t *fcode;
-
+ /* soap fault reason sub element */
axis2_soap_fault_reason_t *freason;
-
+ /* soap fault node sub element */
axis2_soap_fault_node_t *fnode;
-
+ /* soap fault role sub element */
axis2_soap_fault_role_t *frole;
-
+ /* soap fault detail sub element */
axis2_soap_fault_detail_t *fdetail;
axis2_char_t *exception;
-
+ /* soap version */
int soap_version;
-
+ /* reference to soap builder */
axis2_soap_builder_t *soap_builder;
}axis2_soap_fault_impl_t;
@@ -165,9 +162,7 @@
fault_impl->fnode = NULL;
fault_impl->freason = NULL;
fault_impl->frole = NULL;
- fault_impl->om_ele = NULL;
fault_impl->om_ele_node = NULL;
- fault_impl->parent = NULL;
fault_impl->soap_fault.ops = NULL;
fault_impl->soap_version = AXIS2_SOAP_VERSION_NOT_SET;
@@ -243,25 +238,17 @@
return NULL;
fault_impl = AXIS2_INTF_TO_IMPL(fault);
-
- fault_impl->parent = body;
-
parent_node = AXIS2_SOAP_BODY_GET_BASE_NODE(body, env);
-
parent_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(
parent_node, env);
-
parent_ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(parent_ele, env);
-
this_ele = axis2_om_element_create(env,
parent_node,
AXIS2_SOAP_FAULT_LOCAL_NAME,
parent_ns,
&this_node);
- fault_impl->om_ele = this_ele;
fault_impl->om_ele_node = this_node;
return &(fault_impl->soap_fault);
-
}
@@ -331,14 +318,10 @@
axis2_soap_fault_code_t *code)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *code_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, code, AXIS2_FAILURE);
-
fault_impl = AXIS2_INTF_TO_IMPL(fault);
- /* axis2_soap_fault_get_code(fault_code, env);
+ /* axis2_soap_fault_get_code(fault_code, env);
if(fault_impl->fcode)
{
my_node = AXIS2_SOAP_FAULT_CODE_GET_BASE_NODE(
@@ -346,10 +329,8 @@
AXIS2_SOAP_FAULT_CODE_FREE(fault_impl->fcode, env);
fault_impl->fcode = NULL;
}
-
code_node = AXIS2_SOAP_FAULT_CODE_GET_BASE_NODE(
code, env);
-
axis2_soap_utils_set_new_node(env,
fault_impl->om_ele_node,
&my_node,
@@ -364,9 +345,6 @@
axis2_env_t **env)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *code_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_code_t* code = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
@@ -383,17 +361,16 @@
break;
}
}
-
-
/*
+ axis2_om_node_t *code_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_code_t* code = NULL;
this_node = fault_impl->om_ele_node;
-
if(!(fault_impl->fcode))
{
code_node = axis2_soap_utils_get_child_with_name(env,
this_node,
AXIS2_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME);
-
code = axis2_soap_fault_code_create(env);
AXIS2_SOAP_FAULT_CODE_SET_BASE_NODE(code , env, code_node);
fault_impl->fcode = code;
@@ -408,14 +385,13 @@
axis2_soap_fault_reason_t *reason)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *reason_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, reason, AXIS2_FAILURE);
-
fault_impl = AXIS2_INTF_TO_IMPL(fault);
- /* axis2_soap_fault_get_reason(fault_reason, env);
+ /*
+ axis2_om_node_t *reason_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+ axis2_soap_fault_get_reason(fault_reason, env);
if(fault_impl->freason)
{
my_node = AXIS2_SOAP_FAULT_REASON_GET_BASE_NODE(
@@ -423,10 +399,8 @@
AXIS2_SOAP_FAULT_REASON_FREE(fault_impl->freason, env);
fault_impl->freason = NULL;
}
-
reason_node = AXIS2_SOAP_FAULT_REASON_GET_BASE_NODE(
reason, env);
-
axis2_soap_utils_set_new_node(env,
fault_impl->om_ele_node,
&my_node,
@@ -434,7 +408,6 @@
*/
fault_impl->freason = reason;
return AXIS2_SUCCESS;
-
}
axis2_soap_fault_reason_t* AXIS2_CALL
@@ -442,13 +415,9 @@
axis2_env_t **env)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *reason_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_reason_t* reason = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
- this_node = fault_impl->om_ele_node;
if(fault_impl->freason)
{
return fault_impl->freason;
@@ -463,12 +432,15 @@
}
}
/*
+ axis2_om_node_t *reason_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_reason_t* reason = NULL;
+ this_node = fault_impl->om_ele_node;
if(!(fault_impl->freason))
{
reason_node = axis2_soap_utils_get_child_with_name(env,
this_node,
AXIS2_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME);
-
reason = axis2_soap_fault_reason_create(env);
AXIS2_SOAP_FAULT_REASON_SET_BASE_NODE(reason , env, reason_node);
fault_impl->freason = reason;
@@ -483,14 +455,13 @@
axis2_soap_fault_node_t *node)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *node_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
-
fault_impl = AXIS2_INTF_TO_IMPL(fault);
- /* axis2_soap_fault_get_node(fault_node, env);
+ /*
+ axis2_om_node_t *node_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+ axis2_soap_fault_get_node(fault_node, env);
if(fault_impl->fnode)
{
my_node = AXIS2_SOAP_FAULT_NODE_GET_BASE_NODE(
@@ -498,10 +469,8 @@
AXIS2_SOAP_FAULT_NODE_FREE(fault_impl->fnode, env);
fault_impl->fnode = NULL;
}
-
node_node = AXIS2_SOAP_FAULT_NODE_GET_BASE_NODE(
node, env);
-
axis2_soap_utils_set_new_node(env,
fault_impl->om_ele_node,
&my_node,
@@ -509,7 +478,6 @@
*/
fault_impl->fnode = node;
return AXIS2_SUCCESS;
-
}
axis2_soap_fault_node_t* AXIS2_CALL
@@ -517,9 +485,6 @@
axis2_env_t **env)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *node_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_node_t* node = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
@@ -538,22 +503,21 @@
}
}
/*
-
+ axis2_om_node_t *node_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_node_t* node = NULL;
this_node = fault_impl->om_ele_node;
-
if(!(fault_impl->fnode))
{
node_node = axis2_soap_utils_get_child_with_name(env,
this_node,
AXIS2_SOAP12_SOAP_FAULT_NODE_LOCAL_NAME);
-
node = axis2_soap_fault_node_create(env);
AXIS2_SOAP_FAULT_NODE_SET_BASE_NODE(node , env, node_node);
fault_impl->fnode = node;
}
*/
return fault_impl->fnode;
-
}
axis2_status_t AXIS2_CALL
@@ -562,14 +526,15 @@
axis2_soap_fault_role_t *role)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *role_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
+
AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, role, AXIS2_FAILURE);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
- /* axis2_soap_fault_get_role(fault_role, env);
+ /*
+ axis2_om_node_t *role_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+ axis2_soap_fault_get_role(fault_role, env);
if(fault_impl->frole)
{
my_node = AXIS2_SOAP_FAULT_ROLE_GET_BASE_NODE(
@@ -577,10 +542,8 @@
AXIS2_SOAP_FAULT_ROLE_FREE(fault_impl->frole, env);
fault_impl->frole = NULL;
}
-
role_node = AXIS2_SOAP_FAULT_ROLE_GET_BASE_NODE(
role, env);
-
axis2_soap_utils_set_new_node(env,
fault_impl->om_ele_node,
&my_node,
@@ -596,9 +559,6 @@
axis2_env_t **env)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *role_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_role_t* role = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
@@ -616,6 +576,9 @@
}
}
/*
+ axis2_om_node_t *role_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_role_t* role = NULL;
this_node = fault_impl->om_ele_node;
if(!(fault_impl->frole))
{
@@ -637,14 +600,15 @@
axis2_soap_fault_detail_t *detail)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *detail_node = NULL;
- axis2_om_node_t *my_node = NULL;
AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, detail, AXIS2_FAILURE);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
- /* axis2_soap_fault_get_detail(fault_detail, env);
+ /*
+ axis2_om_node_t *detail_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+ axis2_soap_fault_get_detail(fault_detail, env);
if(fault_impl->fdetail)
{
my_node = AXIS2_SOAP_FAULT_DETAIL_GET_BASE_NODE(
@@ -672,9 +636,6 @@
axis2_env_t **env)
{
axis2_soap_fault_impl_t *fault_impl = NULL;
- axis2_om_node_t *detail_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_detail_t* detail = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
@@ -691,8 +652,10 @@
break;
}
}
-
/*
+ axis2_om_node_t *detail_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_detail_t* detail = NULL;
this_node = fault_impl->om_ele_node;
if(!(fault_impl->fdetail))
@@ -718,15 +681,13 @@
AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
fault_impl = AXIS2_INTF_TO_IMPL(fault);
-
- if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
+
+ if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
fault_impl->om_ele_node = node;
- fault_impl->om_ele = (axis2_om_element_t *)
- AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
return AXIS2_SUCCESS;
}
@@ -836,4 +797,4 @@
fault_impl = AXIS2_INTF_TO_IMPL(fault);
fault_impl->soap_builder = builder;
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c Tue Jan 24 22:13:10 2006
@@ -235,14 +235,15 @@
axis2_soap_fault_value_t *fault_val)
{
axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
- axis2_om_node_t *value_node = NULL;
- axis2_om_node_t *my_node = NULL;
AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, fault_val, AXIS2_FAILURE);
fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
- /* axis2_soap_fault_code_get_value(fault_code, env);
+ /*
+ axis2_om_node_t *value_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+ axis2_soap_fault_code_get_value(fault_code, env);
if(fault_code_impl->value)
{
my_node = AXIS2_SOAP_FAULT_VALUE_GET_BASE_NODE(
@@ -269,15 +270,14 @@
axis2_soap_fault_sub_code_t *fault_subcode)
{
axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
- axis2_om_node_t *subcode_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, fault_subcode, AXIS2_FAILURE);
-
fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
- /*
- /* axis2_soap_fault_code_get_sub_code(fault_code, env);
+ /*
+ axis2_om_node_t *subcode_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+
+ axis2_soap_fault_code_get_sub_code(fault_code, env);
if(fault_code_impl->subcode)
{
my_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(
@@ -285,7 +285,6 @@
AXIS2_SOAP_FAULT_SUB_CODE_FREE(fault_code_impl->subcode, env);
fault_code_impl->subcode = NULL;
}
-
subcode_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(
fault_subcode, env);
@@ -303,9 +302,6 @@
axis2_env_t **env)
{
axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
- axis2_om_node_t *subcode_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_sub_code_t* subcode = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
@@ -327,8 +323,10 @@
}
/*
+ axis2_om_node_t *subcode_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_sub_code_t* subcode = NULL;
this_node = fault_code_impl->om_ele_node;
-
if(!(fault_code_impl->subcode))
{
subcode_node = axis2_soap_utils_get_child_with_name(env,
@@ -341,7 +339,6 @@
}
*/
return fault_code_impl->subcode;
-
}
axis2_soap_fault_value_t* AXIS2_CALL
@@ -349,9 +346,7 @@
axis2_env_t **env)
{
axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
- axis2_om_node_t *value_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_value_t* fault_value = NULL;
+
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
@@ -372,9 +367,11 @@
}
}
/*
- this_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_code, env);
-
+ axis2_om_node_t *value_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_value_t* fault_value = NULL;
+ this_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_code, env);
if(!(fault_code_impl->value))
{
value_node = axis2_soap_utils_get_child_with_name(env,
@@ -388,7 +385,6 @@
}
*/
return fault_code_impl->value;
-
}
axis2_status_t AXIS2_CALL
@@ -472,6 +468,4 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, fault, NULL);
return axis2_soap_fault_code_create_with_parent(env, fault, AXIS2_TRUE);
-
}
-
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c Tue Jan 24 22:13:10 2006
@@ -27,17 +27,13 @@
typedef struct axis2_soap_fault_reason_impl_t
{
axis2_soap_fault_reason_t fault_reason;
-
- axis2_om_element_t *om_ele;
-
+ /* corresponding om element node */
axis2_om_node_t *om_ele_node;
-
- axis2_soap_fault_t *parent;
-
+ /* sub element soap fault text */
axis2_soap_fault_text_t *text;
-
+ /* pointer to soap builder */
axis2_soap_builder_t *soap_builder;
-
+ /* soap version */
int soap_version;
}axis2_soap_fault_reason_impl_t;
@@ -96,7 +92,7 @@
AXIS2_DECLARE(axis2_soap_fault_reason_t *)
axis2_soap_fault_reason_create(axis2_env_t **env)
{
- axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
+ axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
fault_reason_impl = (axis2_soap_fault_reason_impl_t*) AXIS2_MALLOC(
(*env)->allocator,
@@ -108,13 +104,9 @@
}
fault_reason_impl->fault_reason.ops = NULL;
- fault_reason_impl->om_ele = NULL;
fault_reason_impl->om_ele_node = NULL;
fault_reason_impl->text = NULL;
-
fault_reason_impl->soap_version = AXIS2_SOAP_VERSION_NOT_SET;
- fault_reason_impl->parent = NULL;
-
fault_reason_impl->fault_reason.ops =
(axis2_soap_fault_reason_ops_t*)AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_soap_fault_reason_ops_t));
@@ -149,8 +141,6 @@
fault_reason_impl->fault_reason.ops->set_builder =
axis2_soap_fault_reason_set_builder;
-
-
return &(fault_reason_impl->fault_reason);
}
@@ -175,11 +165,7 @@
return NULL;
fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
-
- fault_reason_impl->parent = fault;
-
parent_node = AXIS2_SOAP_FAULT_GET_BASE_NODE(fault, env);
-
parent_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(
parent_node, env);
@@ -193,9 +179,7 @@
AXIS2_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME,
parent_ns,
&this_node);
- fault_reason_impl->om_ele = this_ele;
fault_reason_impl->om_ele_node = this_node;
-
AXIS2_SOAP_FAULT_SET_REASON(fault, env, fault_reason);
return &(fault_reason_impl->fault_reason);
}
@@ -231,14 +215,12 @@
axis2_soap_fault_text_t *soap_text)
{
axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
- axis2_om_node_t *text_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, soap_text, AXIS2_FAILURE);
-
fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
/*
+ axis2_om_node_t *text_node = NULL;
+ axis2_om_node_t *my_node = NULL;
if(fault_reason_impl->text)
{
my_node = AXIS2_SOAP_FAULT_TEXT_GET_BASE_NODE(
@@ -246,10 +228,8 @@
AXIS2_SOAP_FAULT_TEXT_FREE(fault_reason_impl->text, env);
fault_reason_impl->text = NULL;
}
-
text_node = AXIS2_SOAP_FAULT_TEXT_GET_BASE_NODE(
soap_text, env);
-
axis2_soap_utils_set_new_node(env,
fault_reason_impl->om_ele_node,
&my_node,
@@ -265,16 +245,11 @@
axis2_env_t **env)
{
axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
- axis2_om_node_t *text_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_text_t* text = NULL;
int status = AXIS2_SUCCESS;
-
AXIS2_FUNC_PARAM_CHECK(fault_reason, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, fault_reason, NULL);
fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
- this_node = fault_reason_impl->om_ele_node ;
-
+
if(fault_reason_impl->text)
{
return fault_reason_impl->text;
@@ -288,17 +263,21 @@
return NULL;
}
}
-
+ /*
+ axis2_om_node_t *text_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_text_t* text = NULL;
+ this_node = fault_reason_impl->om_ele_node ;
if(!(fault_reason_impl->text))
{
text_node = axis2_soap_utils_get_child_with_name(env,
this_node,
AXIS2_SOAP12_SOAP_FAULT_TEXT_LOCAL_NAME);
-
text = axis2_soap_fault_text_create(env);
AXIS2_SOAP_FAULT_TEXT_SET_BASE_NODE(text , env, text_node);
fault_reason_impl->text = text;
}
+ */
return fault_reason_impl->text;
}
@@ -313,17 +292,13 @@
AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
-
if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
fault_reason_impl->om_ele_node = node;
- fault_reason_impl->om_ele = (axis2_om_element_t *)
- AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
return AXIS2_SUCCESS;
-
}
axis2_om_node_t* AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c Tue Jan 24 22:13:10 2006
@@ -24,17 +24,15 @@
typedef struct axis2_soap_fault_sub_code_impl_t
{
axis2_soap_fault_sub_code_t fault_sub_code;
-
+ /* corresponding om element node */
axis2_om_node_t *om_ele_node;
-
- axis2_om_element_t *om_ele;
-
+ /* sub element fault value */
axis2_soap_fault_value_t *value;
-
+ /* sub element fault subcode */
axis2_soap_fault_sub_code_t *subcode;
-
+ /* soap version */
int soap_version;
-
+ /* pointer to soap builder */
axis2_soap_builder_t *builder;
}axis2_soap_fault_sub_code_impl_t;
@@ -115,10 +113,8 @@
}
fault_subcode_impl->fault_sub_code.ops = NULL;
- fault_subcode_impl->om_ele = NULL;
fault_subcode_impl->om_ele_node = NULL;
-
- fault_subcode_impl->soap_version = AXIS2_SOAP_VERSION_NOT_SET;
+ fault_subcode_impl->soap_version = AXIS2_SOAP12;
fault_subcode_impl->value = NULL;
fault_subcode_impl->subcode = NULL;
fault_subcode_impl->builder = NULL;
@@ -180,12 +176,10 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, fault_code, NULL);
-
fault_sub_code = axis2_soap_fault_sub_code_create(env);
if(!fault_sub_code)
return NULL;
fault_sub_code_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
-
parent_node = AXIS2_SOAP_FAULT_CODE_GET_BASE_NODE(fault_code, env);
parent_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(
parent_node, env);
@@ -195,7 +189,6 @@
AXIS2_SOAP12_SOAP_FAULT_SUB_CODE_LOCAL_NAME,
AXIS2_OM_ELEMENT_GET_NAMESPACE(parent_ele, env),
&this_node);
- fault_sub_code_impl->om_ele = this_ele;
fault_sub_code_impl->om_ele_node = this_node;
AXIS2_SOAP_FAULT_CODE_SET_SUB_CODE(fault_code, env, fault_sub_code);
return &(fault_sub_code_impl->fault_sub_code);
@@ -236,14 +229,13 @@
axis2_soap_fault_sub_code_t *sub_code)
{
axis2_soap_fault_sub_code_impl_t *fault_subcode_impl = NULL;
- axis2_om_node_t *subcode_node = NULL;
- axis2_om_node_t *my_node = NULL;
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, sub_code, AXIS2_FAILURE);
-
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
- subcode_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(sub_code, env);
/*
+ axis2_om_node_t *subcode_node = NULL;
+ axis2_om_node_t *my_node = NULL;
+ subcode_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(sub_code, env);
if(fault_subcode_impl->subcode)
{
my_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(
@@ -251,9 +243,10 @@
AXIS2_SOAP_FAULT_SUB_CODE_FREE(fault_subcode_impl->subcode, env);
fault_subcode_impl->subcode = NULL;
}
-
- axis2_soap_utils_set_new_node(env, fault_subcode_impl->om_ele_node, &my_node,
- subcode_node);
+ axis2_soap_utils_set_new_node(env,
+ fault_subcode_impl->om_ele_node,
+ &my_node,
+ subcode_node);
*/
fault_subcode_impl->subcode = sub_code;
return AXIS2_SUCCESS;
@@ -265,30 +258,28 @@
axis2_env_t **env)
{
axis2_soap_fault_sub_code_impl_t *fault_subcode_impl = NULL;
- axis2_om_node_t *subcode_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_value_t* fault_value = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, NULL);
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
- this_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_sub_code, env);
-
if(fault_subcode_impl->builder)
{
while(!(fault_subcode_impl->value) && !AXIS2_OM_NODE_GET_BUILD_STATUS(fault_subcode_impl->om_ele_node, env))
{
status = AXIS2_SOAP_BUILDER_NEXT(fault_subcode_impl->builder, env);
if(status == AXIS2_FAILURE)
- return NULL;
+ break;
}
}
/*
+ axis2_om_node_t *subcode_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_value_t* fault_value = NULL;
+ this_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_sub_code, env);
if(!(fault_subcode_impl->value))
{
subcode_node = axis2_soap_utils_get_child_with_name(env,
this_node,
AXIS2_SOAP12_SOAP_FAULT_VALUE_LOCAL_NAME);
-
fault_value = axis2_soap_fault_value_create(env);
AXIS2_SOAP_FAULT_VALUE_SET_BASE_NODE(fault_value, env, subcode_node);
fault_subcode_impl->value = fault_value;
@@ -303,14 +294,13 @@
axis2_soap_fault_value_t *fault_sub_code_val)
{
axis2_soap_fault_sub_code_impl_t *fault_subcode_impl = NULL;
- axis2_om_node_t *value_node = NULL;
- axis2_om_node_t *my_node = NULL;
-
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, fault_sub_code_val, AXIS2_FAILURE);
-
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
+
/*
+ axis2_om_node_t *value_node = NULL;
+ axis2_om_node_t *my_node = NULL;
if(fault_subcode_impl->value)
{
my_node = AXIS2_SOAP_FAULT_VALUE_GET_BASE_NODE(
@@ -318,10 +308,8 @@
AXIS2_SOAP_FAULT_SUB_CODE_FREE(fault_subcode_impl->value, env);
fault_subcode_impl->value = NULL;
}
-
value_node = AXIS2_SOAP_FAULT_VALUE_GET_BASE_NODE(
fault_sub_code_val, env);
-
axis2_soap_utils_set_new_node(env,
fault_subcode_impl->om_ele_node,
&my_node,
@@ -337,28 +325,24 @@
axis2_env_t **env)
{
axis2_soap_fault_sub_code_impl_t *fault_subcode_impl = NULL;
- axis2_om_node_t *subcode_node = NULL;
- axis2_om_node_t *this_node = NULL;
- axis2_soap_fault_sub_code_t* subcode = NULL;
int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, NULL);
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
- this_node = fault_subcode_impl->om_ele_node;
-
if(fault_subcode_impl->builder)
{
while(!(fault_subcode_impl->subcode) && !AXIS2_OM_NODE_GET_BUILD_STATUS(fault_subcode_impl->om_ele_node, env))
{
status = AXIS2_SOAP_BUILDER_NEXT(fault_subcode_impl->builder, env);
if(status == AXIS2_FAILURE)
- return NULL;
+ break;
}
}
- if(fault_subcode_impl->subcode)
- {
- return subcode;
- }
+
/*
+ axis2_om_node_t *subcode_node = NULL;
+ axis2_om_node_t *this_node = NULL;
+ axis2_soap_fault_sub_code_t* subcode = NULL;
+ this_node = fault_subcode_impl->om_ele_node;
if(!(fault_subcode_impl->subcode))
{
subcode_node = axis2_soap_utils_get_child_with_name(env,
@@ -370,7 +354,7 @@
fault_subcode_impl->subcode = subcode;
}
*/
- return NULL;
+ return fault_subcode_impl->subcode;
}
axis2_status_t AXIS2_CALL
@@ -383,15 +367,12 @@
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
-
if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_BASE_TYPE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
fault_subcode_impl->om_ele_node = node;
- fault_subcode_impl->om_ele = (axis2_om_element_t *)
- AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
return AXIS2_SUCCESS;
}
@@ -436,4 +417,4 @@
subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
subcode_impl->builder = builder;
return AXIS2_SUCCESS;
-}
+}
Modified: webservices/axis2/trunk/c/test/xml/soap/test_soap.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/soap/test_soap.c?rev=372132&r1=372131&r2=372132&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/test/xml/soap/test_soap.c Tue Jan 24 22:13:10 2006
@@ -229,16 +229,8 @@
env = axis2_env_create_with_error_log(allocator, error, log);
axis2_error_init();
- /*build_soap_programatically(&env);*/
-
-
- printf("\nbuild soap\n");
+ build_soap_programatically(&env);
build_soap(&env, filename,uri);
axis2_env_free(env);
-
- env = NULL;
- allocator = NULL;
- printf("\n");
- getchar();
return 0;
}