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 ka...@apache.org on 2008/03/20 12:33:50 UTC
svn commit: r639252 - in /webservices/axis2/trunk/c/axiom/src/soap:
soap12_builder_helper.c soap_body.c soap_builder.c
Author: kaushalye
Date: Thu Mar 20 04:33:49 2008
New Revision: 639252
URL: http://svn.apache.org/viewvc?rev=639252&view=rev
Log:
Axis2C hackathon: Removing unneccessary ENV checks. Code formatting
Modified:
webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c?rev=639252&r1=639251&r2=639252&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Thu Mar 20 04:33:49 2008
@@ -184,8 +184,9 @@
axiom_soap_fault_code_t *soap_fault_code = NULL;
soap_fault_code = axiom_soap_fault_code_create(env);
if (!soap_fault_code)
+ {
return AXIS2_FAILURE;
-
+ }
axiom_soap_fault_code_set_base_node(soap_fault_code, env,
om_ele_node);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_body.c?rev=639252&r1=639251&r2=639252&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_body.c Thu Mar 20 04:33:49 2008
@@ -46,7 +46,6 @@
const axutil_env_t * env)
{
axiom_soap_body_t *soap_body = NULL;
- AXIS2_ENV_CHECK(env, NULL);
soap_body = (axiom_soap_body_t *) AXIS2_MALLOC(env->allocator,
sizeof(axiom_soap_body_t));
@@ -75,7 +74,6 @@
axiom_element_t *parent_ele = NULL;
axiom_namespace_t *om_ns = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, envelope, NULL);
soap_body = axiom_soap_body_create(env);
@@ -121,7 +119,6 @@
axiom_soap_body_t * soap_body,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
if (soap_body->soap_fault)
{
@@ -139,7 +136,6 @@
const axutil_env_t * env)
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (soap_body->soap_fault)
{
@@ -180,7 +176,6 @@
axiom_soap_body_t * soap_body,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
if (soap_body->soap_fault)
{
return soap_body->soap_fault;
@@ -193,7 +188,9 @@
int status = AXIS2_SUCCESS;
status = axiom_soap_builder_next(soap_body->soap_builder, env);
if (status == AXIS2_FAILURE)
+ {
return NULL;
+ }
}
if (soap_body->soap_fault)
{
@@ -209,7 +206,6 @@
axiom_soap_body_t * soap_body,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return soap_body->om_ele_node;
}
@@ -219,7 +215,6 @@
const axutil_env_t * env,
axiom_node_t * node)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
if (axiom_node_get_node_type(node, env) != AXIOM_ELEMENT)
{
@@ -238,6 +233,7 @@
axiom_soap_builder_t * builder)
{
AXIS2_PARAM_CHECK(env->error, builder, AXIS2_FAILURE);
+
soap_body->soap_builder = builder;
return AXIS2_SUCCESS;
}
@@ -248,7 +244,7 @@
const axutil_env_t * env)
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
if (soap_body->om_ele_node && soap_body->soap_builder)
{
while (axiom_node_is_complete(soap_body->om_ele_node, env) !=
@@ -256,7 +252,9 @@
{
status = axiom_soap_builder_next(soap_body->soap_builder, env);
if (status == AXIS2_FAILURE)
+ {
return AXIS2_FAILURE;
+ }
}
}
return AXIS2_SUCCESS;
@@ -294,7 +292,6 @@
const axutil_env_t * env,
axiom_node_t * child)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, child, AXIS2_FAILURE);
if (soap_body->om_ele_node)
@@ -312,23 +309,33 @@
axiom_element_t *body_ele = NULL;
axiom_namespace_t *om_ns = NULL;
axis2_char_t *uri = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
if (!soap_body->om_ele_node)
+ {
return AXIS2_FAILURE;
+ }
body_ele = axiom_node_get_data_element(soap_body->om_ele_node, env);
if (!body_ele)
+ {
return AXIS2_FAILURE;
+ }
om_ns = axiom_element_get_namespace(body_ele, env, soap_body->om_ele_node);
if (!om_ns)
+ {
return AXIS2_FAILURE;
+ }
uri = axiom_namespace_get_uri(om_ns, env);
if (uri)
{
if (axutil_strcmp(uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
+ {
return AXIOM_SOAP11;
+ }
else if (axutil_strcmp(uri, AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) ==
0)
+ {
return AXIOM_SOAP12;
+ }
}
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?rev=639252&r1=639251&r2=639252&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Thu Mar 20 04:33:49 2008
@@ -107,7 +107,7 @@
{
axiom_soap_builder_t *soap_builder = NULL;
axis2_status_t status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, NULL);
+
AXIS2_PARAM_CHECK(env->error, stax_builder, NULL);
soap_builder = (axiom_soap_builder_t *) AXIS2_MALLOC(env->allocator,
@@ -159,7 +159,6 @@
axiom_soap_builder_t * soap_builder,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
if (!soap_builder)
return;
@@ -228,7 +227,6 @@
{
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, NULL);
if (!soap_builder)
return NULL;
@@ -250,7 +248,6 @@
axiom_soap_builder_t * soap_builder,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
if (!soap_builder)
return NULL;
if (soap_builder->om_builder)
@@ -270,7 +267,7 @@
int current_event = AXIS2_MAX_EVENT;
axiom_node_t *current_node = NULL;
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
if (!soap_builder)
return AXIS2_FAILURE;
if (soap_builder->done)
@@ -318,7 +315,6 @@
axiom_soap_builder_t * soap_builder,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
if (soap_builder->soap_envelope)
{
return axiom_soap_envelope_get_base_node(soap_builder->soap_envelope,
@@ -334,7 +330,6 @@
const axutil_env_t * env, axiom_node_t * current_node, int current_event)
{
int ret_val = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, current_node, AXIS2_FAILURE);
if (!soap_builder)
return AXIS2_FAILURE;
@@ -392,7 +387,6 @@
int element_level = 0;
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_element_node, AXIS2_FAILURE);
if (!soap_builder)
return AXIS2_FAILURE;
@@ -748,8 +742,6 @@
axiom_namespace_t *om_ns = NULL;
axis2_char_t *ns_uri = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (!om_node)
return AXIS2_FAILURE;
@@ -926,7 +918,6 @@
const axutil_env_t * env,
axis2_bool_t value)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
soap_builder->processing_mandatory_fault_elements = value;
return AXIS2_SUCCESS;
}
@@ -937,7 +928,6 @@
const axutil_env_t * env,
axis2_bool_t value)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
soap_builder->processing_detail_elements = value;
return AXIS2_SUCCESS;
}
@@ -947,7 +937,6 @@
axiom_soap_builder_t * soap_builder,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
return soap_builder->processing_detail_elements;
}
@@ -956,7 +945,6 @@
axiom_soap_builder_t * soap_builder,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
return soap_builder->soap_version;
}
@@ -965,7 +953,6 @@
const axutil_env_t * env,
axutil_hash_t * map)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
soap_builder->mime_body_parts = map;
return AXIS2_SUCCESS;
}
@@ -985,7 +972,6 @@
int element_level = 0;
int status = AXIS2_SUCCESS;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_element_node, AXIS2_FAILURE);
if (!soap_builder)
return AXIS2_FAILURE;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org