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 da...@apache.org on 2005/12/16 05:08:11 UTC
svn commit: r357115 [2/3] - in /webservices/axis2/trunk/c: include/
modules/core/deployment/src/ modules/core/description/src/
modules/core/engine/src/ modules/core/phaseresolver/src/
modules/core/transport/http/src/ modules/util/src/ modules/wsdl/src/...
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding.c Thu Dec 15 20:06:29 2005
@@ -129,7 +129,7 @@
if(NULL == wsdl_binding_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -143,7 +143,7 @@
if(NULL == wsdl_binding_impl->binding_ops)
{
axis2_wsdl_binding_free(&(wsdl_binding_impl->wsdl_binding), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -151,7 +151,7 @@
if(NULL == wsdl_binding_impl->binding_faults)
{
axis2_wsdl_binding_free(&(wsdl_binding_impl->wsdl_binding), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -159,7 +159,7 @@
if(NULL == wsdl_binding_impl->wsdl_binding.extensible_component)
{
axis2_wsdl_binding_free(&(wsdl_binding_impl->wsdl_binding), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -168,7 +168,7 @@
if(NULL == wsdl_binding_impl->wsdl_binding.ops)
{
axis2_wsdl_binding_free(&(wsdl_binding_impl->wsdl_binding), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_fault.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_fault.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_fault.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_fault.c Thu Dec 15 20:06:29 2005
@@ -63,7 +63,7 @@
if(NULL == binding_fault_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -77,7 +77,7 @@
if(NULL == binding_fault_impl->binding_fault.extensible_component)
{
axis2_binding_fault_free(&(binding_fault_impl->binding_fault), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -86,7 +86,7 @@
if(NULL == binding_fault_impl->binding_fault.ops)
{
axis2_binding_fault_free(&(binding_fault_impl->binding_fault), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_msg_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_msg_ref.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_msg_ref.c Thu Dec 15 20:06:29 2005
@@ -80,7 +80,7 @@
if(NULL == binding_msg_ref_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -96,7 +96,7 @@
{
axis2_wsdl_binding_msg_ref_free(&(binding_msg_ref_impl->binding_msg_ref),
env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -106,7 +106,7 @@
{
axis2_wsdl_binding_msg_ref_free(&(binding_msg_ref_impl->binding_msg_ref),
env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_binding_op.c Thu Dec 15 20:06:29 2005
@@ -130,7 +130,7 @@
if(NULL == binding_op_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -149,7 +149,7 @@
{
axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
env);
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -159,7 +159,7 @@
{
axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
env);
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -170,7 +170,7 @@
{
axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
env);
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -181,7 +181,7 @@
{
axis2_wsdl_binding_op_free(&(binding_op_impl->binding_op),
env);
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_component.c Thu Dec 15 20:06:29 2005
@@ -71,15 +71,17 @@
axis2_wsdl_component_t * AXIS2_CALL
axis2_wsdl_component_create (axis2_env_t **env)
{
+ axis2_wsdl_component_impl_t *wsdl_component_impl = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
- axis2_wsdl_component_impl_t *wsdl_component_impl =
- (axis2_wsdl_component_impl_t *) AXIS2_MALLOC ((*env)->allocator,
- sizeof(axis2_wsdl_component_impl_t));
+ wsdl_component_impl = (axis2_wsdl_component_impl_t *) AXIS2_MALLOC ((*env)->
+ allocator, sizeof(axis2_wsdl_component_impl_t));
if(NULL == wsdl_component_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_component_impl->component_properties = NULL;
@@ -89,8 +91,9 @@
wsdl_component_impl->component_properties = axis2_hash_make (env);
if(NULL == wsdl_component_impl->component_properties)
{
- AXIS2_FREE ((*env)->allocator, wsdl_component_impl);
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_wsdl_component_free(&(wsdl_component_impl->wsdl_component), env);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_component_impl->wsdl_component.ops = (axis2_wsdl_component_ops_t *)
@@ -98,8 +101,9 @@
if(NULL == wsdl_component_impl->wsdl_component.ops)
{
- AXIS2_FREE ((*env)->allocator, wsdl_component_impl);
- AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_wsdl_component_free(&(wsdl_component_impl->wsdl_component), env);
+ AXIS2_ERROR_SET ((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_component_impl->wsdl_component.ops->free = axis2_wsdl_component_free;
@@ -223,10 +227,69 @@
axis2_env_t **env,
axis2_hash_t *properties)
{
+ axis2_wsdl_component_impl_t *component_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, properties, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(wsdl_component)->component_properties = properties;
+ component_impl = AXIS2_INTF_TO_IMPL(wsdl_component);
+
+ if(component_impl->component_properties)
+ {
+ axis2_hash_index_t *hi = NULL;
+ void *val = NULL;
+ void *key = NULL;
+ for (hi = axis2_hash_first (component_impl->component_properties, env); hi;
+ hi = axis2_hash_next ( env, hi))
+ {
+ axis2_param_container_t *param_container = NULL;
+ axis2_array_list_t *module_desc_list = NULL;
+
+ axis2_hash_this (hi, &key, NULL, &val);
+
+ if(0 == AXIS2_STRCMP(PARAMETER_KEY, (axis2_char_t *)key))
+ {
+ param_container = (axis2_param_container_t *) val;
+ AXIS2_PARAM_CONTAINER_FREE(param_container, env);
+ param_container = NULL;
+ }
+
+ if(0 == AXIS2_STRCMP(MODULEREF_KEY, (axis2_char_t *)key))
+ {
+ void *val = NULL;
+ int i = 0;
+ int size = 0;
+ module_desc_list = (axis2_array_list_t *) val;
+ if(module_desc_list)
+ {
+ size = AXIS2_ARRAY_LIST_SIZE(module_desc_list, env);
+ for (i = 0; i < size; i++)
+ {
+ struct axis2_module_desc *module_desc = NULL;
+ module_desc = AXIS2_ARRAY_LIST_GET(module_desc_list, env, i);
+
+ module_desc = (struct axis2_module_desc *) val;
+ if (module_desc)
+ AXIS2_MODULE_DESC_FREE (module_desc, env);
+
+ val = NULL;
+ module_desc = NULL;
+
+ }
+ AXIS2_ARRAY_LIST_FREE(module_desc_list, env);
+ }
+
+ module_desc_list = NULL;
+ }
+
+ val = NULL;
+ key = NULL;
+
+ }
+ axis2_hash_free(component_impl->component_properties, env);
+ component_impl->component_properties = NULL;
+ }
+ component_impl->component_properties = properties;
return AXIS2_SUCCESS;
}
@@ -246,16 +309,16 @@
void *key,
void *value)
{
- printf("key:%s\n", key);
axis2_wsdl_component_impl_t *component_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, key, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
- printf("came60\n");
+
component_impl = AXIS2_INTF_TO_IMPL(wsdl_component);
- printf("came61\n");
+
axis2_hash_set (component_impl->component_properties, key, sizeof(key), value);
- printf("came62\n");
+
return AXIS2_SUCCESS;
}
@@ -281,6 +344,7 @@
AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, element, AXIS2_FAILURE);
+
component_impl = AXIS2_INTF_TO_IMPL(wsdl_component);
if (NULL == component_impl->elements)
@@ -300,10 +364,6 @@
AXIS2_FUNC_PARAM_CHECK(wsdl_component, env, NULL);
component_impl = AXIS2_INTF_TO_IMPL(wsdl_component);
- if (NULL == component_impl->elements)
- {
- component_impl->elements = axis2_linked_list_create(env);
- }
return component_impl->elements;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_endpoint.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_endpoint.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_endpoint.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_endpoint.c Thu Dec 15 20:06:29 2005
@@ -77,7 +77,7 @@
if(NULL == wsdl_endpoint_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -90,7 +90,7 @@
if(NULL == wsdl_endpoint_impl->wsdl_endpoint.wsdl_component)
{
axis2_wsdl_endpoint_free(&(wsdl_endpoint_impl->wsdl_endpoint), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -99,7 +99,7 @@
if(NULL == wsdl_endpoint_impl->wsdl_endpoint.ops)
{
axis2_wsdl_endpoint_free(&(wsdl_endpoint_impl->wsdl_endpoint), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_component.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_component.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_component.c Thu Dec 15 20:06:29 2005
@@ -74,6 +74,7 @@
axis2_wsdl_extensible_component_create (axis2_env_t **env)
{
axis2_wsdl_extensible_component_impl_t *extensible_component_impl = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
extensible_component_impl = (axis2_wsdl_extensible_component_impl_t *)
@@ -82,7 +83,7 @@
if(NULL == extensible_component_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -96,7 +97,7 @@
{
axis2_wsdl_extensible_component_free(&(extensible_component_impl->
extensible_component), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -105,7 +106,7 @@
{
axis2_wsdl_extensible_component_free(&(extensible_component_impl->
extensible_component), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -115,7 +116,7 @@
{
axis2_wsdl_extensible_component_free(&(extensible_component_impl->
extensible_component), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -124,8 +125,10 @@
AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_wsdl_extensible_component_ops_t));
if(NULL == extensible_component_impl->extensible_component.ops)
{
- AXIS2_FREE((*env)->allocator, extensible_component_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_wsdl_extensible_component_free(&(extensible_component_impl->
+ extensible_component), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
extensible_component_impl->extensible_component.ops->free =
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_element.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_element.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_extensible_element.c Thu Dec 15 20:06:29 2005
@@ -77,7 +77,7 @@
if(NULL == extensible_element_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -90,7 +90,7 @@
{
axis2_wsdl_extensible_element_free(&(extensible_element_impl->
extensible_element), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_fault_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_fault_ref.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_fault_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_fault_ref.c Thu Dec 15 20:06:29 2005
@@ -84,23 +84,32 @@
axis2_wsdl_fault_ref_t * AXIS2_CALL
axis2_wsdl_fault_ref_create (axis2_env_t **env)
{
+ axis2_wsdl_fault_ref_impl_t *fault_ref_impl = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
- axis2_wsdl_fault_ref_impl_t *fault_ref_impl =
- (axis2_wsdl_fault_ref_impl_t *) AXIS2_MALLOC((*env)->allocator,
- sizeof(axis2_wsdl_fault_ref_impl_t));
-
+ fault_ref_impl = (axis2_wsdl_fault_ref_impl_t *) AXIS2_MALLOC((*env)->
+ allocator, sizeof(axis2_wsdl_fault_ref_impl_t));
if(NULL == fault_ref_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ fault_ref_impl->msg_label = NULL;
+ fault_ref_impl->direction = NULL;
+ fault_ref_impl->ref = NULL;
+ fault_ref_impl->fault_ref.wsdl_component = NULL;
+ fault_ref_impl->fault_ref.ops = NULL;
- fault_ref_impl->fault_ref.wsdl_component =
- axis2_wsdl_component_create(env);
+ fault_ref_impl->fault_ref.wsdl_component = axis2_wsdl_component_create(env);
if(NULL == fault_ref_impl->fault_ref.wsdl_component)
{
AXIS2_FREE((*env)->allocator, fault_ref_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
fault_ref_impl->fault_ref.ops =
@@ -109,7 +118,8 @@
{
AXIS2_WSDL_COMPONENT_FREE(fault_ref_impl->fault_ref.wsdl_component, env);
AXIS2_FREE((*env)->allocator, fault_ref_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
fault_ref_impl->fault_ref.ops->free = axis2_wsdl_fault_ref_free;
@@ -127,14 +137,8 @@
axis2_wsdl_fault_ref_set_msg_label;
fault_ref_impl->fault_ref.ops->get_ref = axis2_wsdl_fault_ref_get_ref;
-
fault_ref_impl->fault_ref.ops->set_ref = axis2_wdsl_fault_ref_set_ref;
-
- fault_ref_impl->msg_label = NULL;
- fault_ref_impl->direction = NULL;
- fault_ref_impl->ref = NULL;
-
return &(fault_ref_impl->fault_ref);
}
@@ -144,29 +148,45 @@
axis2_wsdl_fault_ref_free (axis2_wsdl_fault_ref_t *fault_ref,
axis2_env_t **env)
{
+ axis2_wsdl_fault_ref_impl_t *fault_ref_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(fault_ref, env, AXIS2_FAILURE);
+
+ fault_ref_impl = AXIS2_INTF_TO_IMPL(fault_ref);
+
if(NULL != fault_ref->ops)
+ {
AXIS2_FREE((*env)->allocator, fault_ref->ops);
+ fault_ref->ops = NULL;
+ }
- if(NULL != AXIS2_INTF_TO_IMPL(fault_ref)->msg_label)
+ if(NULL != fault_ref_impl->msg_label)
{
AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(fault_ref)->msg_label);
+ fault_ref_impl->msg_label = NULL;
}
- if(NULL != AXIS2_INTF_TO_IMPL(fault_ref)->msg_label)
+ if(NULL != fault_ref_impl->direction)
{
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(fault_ref)->msg_label);
+ AXIS2_FREE((*env)->allocator, fault_ref_impl->direction);
+ fault_ref_impl->direction = NULL;
}
- if(NULL != AXIS2_INTF_TO_IMPL(fault_ref)->ref)
+ if(NULL != fault_ref_impl->ref)
{
- AXIS2_QNAME_FREE(AXIS2_INTF_TO_IMPL(fault_ref)->ref, env);
+ AXIS2_QNAME_FREE(fault_ref_impl->ref, env);
+ fault_ref_impl->ref = NULL;
}
if(NULL != fault_ref->wsdl_component)
+ {
AXIS2_WSDL_COMPONENT_FREE(fault_ref->wsdl_component, env);
+ fault_ref->wsdl_component = NULL;
+ }
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(fault_ref));
+ if(fault_ref_impl)
+ AXIS2_FREE((*env)->allocator, fault_ref_impl);
+ fault_ref_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -184,9 +204,18 @@
axis2_env_t **env,
axis2_char_t *direction)
{
+ axis2_wsdl_fault_ref_impl_t *fault_ref_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(fault_ref, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, direction, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(fault_ref)->direction = direction;
+
+ fault_ref_impl = AXIS2_INTF_TO_IMPL(fault_ref);
+ if(fault_ref_impl->direction)
+ {
+ AXIS2_FREE((*env)->allocator, fault_ref_impl->direction);
+ fault_ref_impl->direction = NULL;
+ }
+ fault_ref_impl->direction = AXIS2_STRDUP(direction, env);
return AXIS2_SUCCESS;
}
@@ -203,9 +232,18 @@
axis2_env_t **env,
axis2_char_t *msg_label)
{
+ axis2_wsdl_fault_ref_impl_t *fault_ref_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(fault_ref, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_label, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(fault_ref)->msg_label = msg_label;
+
+ fault_ref_impl = AXIS2_INTF_TO_IMPL(fault_ref);
+ if(fault_ref_impl->msg_label)
+ {
+ AXIS2_FREE((*env)->allocator, fault_ref_impl->msg_label);
+ fault_ref_impl->msg_label = NULL;
+ }
+ fault_ref_impl->msg_label = AXIS2_STRDUP(msg_label, env);
return AXIS2_SUCCESS;
}
@@ -222,8 +260,17 @@
axis2_env_t **env,
axis2_qname_t *ref)
{
+ axis2_wsdl_fault_ref_impl_t *fault_ref_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(fault_ref, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, ref, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(fault_ref)->ref = ref;
+
+ fault_ref_impl = AXIS2_INTF_TO_IMPL(fault_ref);
+ if(fault_ref_impl->ref)
+ {
+ AXIS2_QNAME_FREE(fault_ref_impl->ref, env);
+ fault_ref_impl->ref = NULL;
+ }
+ fault_ref_impl->ref = AXIS2_QNAME_CLONE(ref, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_feature.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_feature.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_feature.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_feature.c Thu Dec 15 20:06:29 2005
@@ -70,7 +70,7 @@
if(NULL == wsdl_feature_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -83,7 +83,7 @@
if(NULL == wsdl_feature_impl->wsdl_feature.wsdl_component)
{
axis2_wsdl_feature_free(&(wsdl_feature_impl->wsdl_feature), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -92,7 +92,7 @@
if(NULL == wsdl_feature_impl->wsdl_feature.ops)
{
axis2_wsdl_feature_free(&(wsdl_feature_impl->wsdl_feature), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_interface.c Thu Dec 15 20:06:29 2005
@@ -138,61 +138,68 @@
axis2_wsdl_interface_t * AXIS2_CALL
axis2_wsdl_interface_create (axis2_env_t **env)
{
+ axis2_wsdl_interface_impl_t *wsdl_interface_impl = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
- axis2_wsdl_interface_impl_t *wsdl_interface_impl =
- (axis2_wsdl_interface_impl_t *) AXIS2_MALLOC ((*env)->allocator,
- sizeof (axis2_wsdl_interface_impl_t));
+
+ wsdl_interface_impl = (axis2_wsdl_interface_impl_t *) AXIS2_MALLOC ((*env)->
+ allocator, sizeof (axis2_wsdl_interface_impl_t));
if(NULL == wsdl_interface_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
+ wsdl_interface_impl->wsdl_interface.extensible_component = NULL;
+ wsdl_interface_impl->qname = NULL;
+ wsdl_interface_impl->style_default = NULL;
+ wsdl_interface_impl->faults = NULL;
+ wsdl_interface_impl->super_interfaces = NULL;
+ wsdl_interface_impl->ops = NULL;
+ wsdl_interface_impl->wsdl_interface.ops = NULL;
+
+ wsdl_interface_impl->wsdl_interface.extensible_component =
+ axis2_wsdl_extensible_component_create(env);
+
+ if(NULL == wsdl_interface_impl->wsdl_interface.extensible_component)
+ {
+ axis2_wsdl_interface_free(&(wsdl_interface_impl->wsdl_interface), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
wsdl_interface_impl->faults = axis2_linked_list_create(env);
if(NULL == wsdl_interface_impl->faults)
{
- AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_wsdl_interface_free(&(wsdl_interface_impl->wsdl_interface), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_interface_impl->super_interfaces = axis2_hash_make(env);
if(NULL == wsdl_interface_impl->super_interfaces)
{
- AXIS2_LINKED_LIST_FREE(wsdl_interface_impl->faults, env);
- AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_wsdl_interface_free(&(wsdl_interface_impl->wsdl_interface), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_interface_impl->ops = axis2_hash_make(env);
if(NULL == wsdl_interface_impl->ops)
{
- axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
- AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- }
-
- wsdl_interface_impl->wsdl_interface.extensible_component =
- axis2_wsdl_extensible_component_create(env);
-
- if(NULL == wsdl_interface_impl->wsdl_interface.extensible_component)
- {
- axis2_hash_free(wsdl_interface_impl->ops, env);
- axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
- AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
- }
+ axis2_wsdl_interface_free(&(wsdl_interface_impl->wsdl_interface), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
wsdl_interface_impl->wsdl_interface.ops = AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_wsdl_interface_ops_t));
if(NULL == wsdl_interface_impl->wsdl_interface.ops)
{
- AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_interface_impl->wsdl_interface.
- extensible_component, env);
- axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
- axis2_hash_free(wsdl_interface_impl->ops, env);
- AXIS2_LINKED_LIST_FREE(wsdl_interface_impl->faults, env);
- AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ axis2_wsdl_interface_free(&(wsdl_interface_impl->wsdl_interface), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_interface_impl->wsdl_interface.ops->free = axis2_wsdl_interface_free;
@@ -244,10 +251,6 @@
wsdl_interface_impl->wsdl_interface.ops->set_style_default =
axis2_wsdl_interface_set_style_default;
-
- wsdl_interface_impl->qname = NULL;
-
- wsdl_interface_impl->style_default = NULL;
return &(wsdl_interface_impl->wsdl_interface);
}
@@ -266,16 +269,20 @@
wsdl_interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
if(NULL != wsdl_interface->ops)
+ {
AXIS2_FREE((*env)->allocator, wsdl_interface->ops);
+ wsdl_interface->ops = NULL;
+ }
if(NULL != wsdl_interface_impl->super_interfaces)
{
axis2_hash_free(wsdl_interface_impl->super_interfaces, env);
+ wsdl_interface_impl->super_interfaces = NULL;
}
if(NULL != wsdl_interface_impl->ops)
{
- axis2_hash_index_t *hi = NULL;
+ /*axis2_hash_index_t *hi = NULL;
void *val = NULL;
for (hi = axis2_hash_first (wsdl_interface_impl->ops, env); hi;
hi = axis2_hash_next ( env, hi))
@@ -283,12 +290,12 @@
struct axis2_wsdl_op *wsdl_optr = NULL;
struct axis2_op *optr = NULL;
axis2_hash_this (hi, NULL, NULL, &val);
- if(AXIS2_OP == wsdl_interface->optr_type)
+ if(AXIS2_OP == wsdl_interface->op_type)
{
optr = (struct axis2_op *) val;
AXIS2_OP_FREE (optr, env);
}
- if(AXIS2_WSDL_OP == wsdl_interface->optr_type)
+ if(AXIS2_WSDL_OP == wsdl_interface->op_type)
{
wsdl_optr = (struct axis2_wsdl_op *) val;
AXIS2_WSDL_OP_FREE(wsdl_optr, env);
@@ -298,7 +305,7 @@
optr = NULL;
wsdl_optr = NULL;
- }
+ }*/
axis2_hash_free(wsdl_interface_impl->ops, env);
wsdl_interface_impl->ops = NULL;
}
@@ -306,23 +313,31 @@
if(NULL != wsdl_interface_impl->faults)
{
AXIS2_LINKED_LIST_FREE(wsdl_interface_impl->faults, env);
+ wsdl_interface_impl->faults = NULL;
}
if(NULL != AXIS2_INTF_TO_IMPL(wsdl_interface)->qname)
{
AXIS2_QNAME_FREE(wsdl_interface_impl->qname, env);
+ wsdl_interface_impl->qname = NULL;
}
if(NULL != wsdl_interface_impl->style_default)
{
AXIS2_FREE((*env)->allocator, wsdl_interface_impl->style_default);
+ wsdl_interface_impl->style_default = NULL;
}
if(NULL != wsdl_interface->extensible_component)
+ {
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_interface->
extensible_component, env);
+ wsdl_interface->extensible_component = NULL;
+ }
- AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
+ if(wsdl_interface_impl)
+ AXIS2_FREE((*env)->allocator, wsdl_interface_impl);
+ wsdl_interface_impl = NULL;
return AXIS2_SUCCESS;
}
@@ -341,13 +356,6 @@
return AXIS2_INTF_TO_IMPL(wsdl_interface)->faults;
}
-axis2_qname_t *AXIS2_CALL
-axis2_wsdl_interface_get_name(axis2_wsdl_interface_t *wsdl_interface,
- axis2_env_t **env)
-{
- return AXIS2_INTF_TO_IMPL(wsdl_interface)->qname;
-}
-
axis2_hash_t *AXIS2_CALL
axis2_wsdl_interface_get_ops(axis2_wsdl_interface_t *wsdl_interface,
axis2_env_t **env)
@@ -392,7 +400,19 @@
axis2_env_t **env,
axis2_linked_list_t *list)
{
- AXIS2_INTF_TO_IMPL(wsdl_interface)->faults = list;
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
+
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+
+ if(interface_impl->faults)
+ {
+ AXIS2_LINKED_LIST_FREE(interface_impl->faults, env);
+ interface_impl->faults = NULL;
+ }
+ interface_impl->faults = list;
return AXIS2_SUCCESS;
}
@@ -401,16 +421,46 @@
axis2_env_t **env,
axis2_qname_t *qName)
{
- AXIS2_INTF_TO_IMPL(wsdl_interface)->qname = qName;
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, qName, AXIS2_FAILURE);
+
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+
+ if(interface_impl->qname)
+ {
+ AXIS2_QNAME_FREE(interface_impl->qname, env);
+ interface_impl->qname = NULL;
+ }
+ interface_impl->qname = qName;
return AXIS2_SUCCESS;
}
+axis2_qname_t *AXIS2_CALL
+axis2_wsdl_interface_get_name(axis2_wsdl_interface_t *wsdl_interface,
+ axis2_env_t **env)
+{
+ return AXIS2_INTF_TO_IMPL(wsdl_interface)->qname;
+}
+
axis2_status_t AXIS2_CALL
axis2_wsdl_interface_set_ops(axis2_wsdl_interface_t *wsdl_interface,
axis2_env_t **env,
axis2_hash_t *list)
{
- AXIS2_INTF_TO_IMPL(wsdl_interface)->ops = list;
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
+
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+ if(interface_impl->ops)
+ {
+ axis2_hash_free(interface_impl->ops, env);
+ interface_impl->ops = NULL;
+ }
+ interface_impl->ops = list;
return AXIS2_SUCCESS;
}
@@ -418,18 +468,22 @@
axis2_wsdl_interface_set_op(axis2_wsdl_interface_t *wsdl_interface,
axis2_env_t **env,
void *op,
- axis2_op_type_t optr_type)
+ axis2_op_type_t op_type)
{
- struct axis2_op *op_l = NULL;
- axis2_qname_t *wsdl_opt_name = NULL;
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+ axis2_qname_t *wsdl_op_name = NULL;
axis2_char_t *op_name = NULL;
+ struct axis2_op *op_l = NULL;
AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+
op_l = (struct axis2_op *) op;
- wsdl_opt_name = AXIS2_WSDL_OP_GET_NAME(op_l->wsdl_op, env);
- if (!wsdl_opt_name)
+
+ wsdl_op_name = AXIS2_WSDL_OP_GET_NAME(op_l->wsdl_op, env);
+ if (!wsdl_op_name)
{
/* The Operation name cannot be null (required) */
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_OP,
@@ -437,11 +491,11 @@
return AXIS2_FAILURE;
}
- op_name = AXIS2_QNAME_GET_LOCALPART(wsdl_opt_name, env);
+ op_name = AXIS2_QNAME_GET_LOCALPART(wsdl_op_name, env);
+
+ axis2_hash_set(interface_impl->ops, op_name, AXIS2_HASH_KEY_STRING, op);
- axis2_hash_set(AXIS2_INTF_TO_IMPL(wsdl_interface)->ops, op_name,
- AXIS2_HASH_KEY_STRING, op);
- wsdl_interface->optr_type = optr_type;
+ wsdl_interface->op_type = op_type;
return AXIS2_SUCCESS;
}
@@ -451,25 +505,50 @@
axis2_env_t **env,
axis2_hash_t *list)
{
- AXIS2_INTF_TO_IMPL(wsdl_interface)->super_interfaces = list;
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, list, AXIS2_FAILURE);
+
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+
+ if(interface_impl->super_interfaces)
+ {
+ axis2_hash_free(interface_impl->super_interfaces, env);
+ interface_impl->super_interfaces = NULL;
+ }
+ interface_impl->super_interfaces = list;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_wsdl_interface_add_super_interface(axis2_wsdl_interface_t *wsdl_interface,
- axis2_env_t **env,
- axis2_wsdl_interface_t *interface_component)
+ axis2_env_t **env,
+ axis2_wsdl_interface_t *interface_component)
{
- axis2_hash_set(AXIS2_INTF_TO_IMPL(wsdl_interface)->super_interfaces,
- axis2_wsdl_interface_get_name(interface_component, env),
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+ axis2_qname_t *qname = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, interface_component, AXIS2_FAILURE);
+
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+
+ qname = axis2_wsdl_interface_get_name(interface_component, env);
+ if(!qname)
+ {
+ return AXIS2_FAILURE;
+ }
+ axis2_hash_set(AXIS2_INTF_TO_IMPL(wsdl_interface)->super_interfaces, qname,
sizeof(axis2_qname_t), interface_component);
+
return AXIS2_SUCCESS;
}
axis2_char_t *AXIS2_CALL
axis2_wsdl_interface_get_style_default(axis2_wsdl_interface_t *wsdl_interface,
axis2_env_t **env)
-{
+{
return AXIS2_INTF_TO_IMPL(wsdl_interface)->style_default;
}
@@ -478,7 +557,18 @@
axis2_env_t **env,
axis2_char_t *style_default)
{
+ axis2_wsdl_interface_impl_t *interface_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(wsdl_interface, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, style_default, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(wsdl_interface)->style_default = style_default;
+ interface_impl = AXIS2_INTF_TO_IMPL(wsdl_interface);
+
+ if(interface_impl->style_default)
+ {
+ AXIS2_FREE((*env)->allocator, interface_impl->style_default);
+ interface_impl->style_default = NULL;
+ }
+ interface_impl->style_default = style_default;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_msg_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_msg_ref.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_msg_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_msg_ref.c Thu Dec 15 20:06:29 2005
@@ -92,7 +92,10 @@
if(NULL == msg_ref_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
msg_ref_impl->msg_ref.extensible_component =
axis2_wsdl_extensible_component_create(env);
@@ -100,7 +103,8 @@
if(NULL == msg_ref_impl->msg_ref.extensible_component)
{
AXIS2_FREE((*env)->allocator, msg_ref_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
msg_ref_impl->msg_ref.ops =
@@ -110,7 +114,8 @@
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(msg_ref_impl->msg_ref.
extensible_component, env);
AXIS2_FREE((*env)->allocator, msg_ref_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
msg_ref_impl->msg_ref.ops->free = axis2_wsdl_msg_ref_free;
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_op.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_op.c Thu Dec 15 20:06:29 2005
@@ -76,14 +76,12 @@
axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_wsdl_op_set_msg_exchange_pattern (
- axis2_wsdl_op_t *wsdl_op,
+axis2_wsdl_op_set_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
axis2_env_t **env,
axis2_char_t *msg_exchange_pattern);
axis2_char_t * AXIS2_CALL
-axis2_wsdl_op_get_msg_exchange_pattern
- (axis2_wsdl_op_t *wsdl_op,
+axis2_wsdl_op_get_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
axis2_env_t **env);
axis2_status_t AXIS2_CALL
@@ -176,7 +174,8 @@
if(!wsdl_op_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
wsdl_op_impl->in_faults = NULL;
@@ -195,7 +194,7 @@
if(NULL == wsdl_op_impl->in_faults)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -203,7 +202,7 @@
if(NULL == wsdl_op_impl->out_faults)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -211,7 +210,7 @@
if(NULL == wsdl_op_impl->wsdl_op.extensible_component)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -221,7 +220,7 @@
if(NULL == wsdl_op_impl->wsdl_op.ops)
{
axis2_wsdl_op_free(&(wsdl_op_impl->wsdl_op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -233,56 +232,26 @@
wsdl_op_impl->wsdl_op.ops->get_msg_exchange_pattern =
axis2_wsdl_op_get_msg_exchange_pattern;
- wsdl_op_impl->wsdl_op.ops->set_name =
- axis2_wsdl_op_set_name;
-
- wsdl_op_impl->wsdl_op.ops->get_name =
- axis2_wsdl_op_get_name;
-
- wsdl_op_impl->wsdl_op.ops->set_style =
- axis2_wsdl_op_set_style;
-
- wsdl_op_impl->wsdl_op.ops->get_style =
- axis2_wsdl_op_get_style;
-
- wsdl_op_impl->wsdl_op.ops->get_in_faults =
- axis2_wsdl_op_get_in_faults;
-
- wsdl_op_impl->wsdl_op.ops->set_in_faults =
- axis2_wsdl_op_set_in_faults;
-
- wsdl_op_impl->wsdl_op.ops->get_input_msg =
- axis2_wsdl_op_get_input_msg;
-
- wsdl_op_impl->wsdl_op.ops->set_input_msg =
- axis2_wsdl_op_set_input_msg;
-
- wsdl_op_impl->wsdl_op.ops->get_out_faults =
- axis2_wsdl_op_get_out_faults;
-
- wsdl_op_impl->wsdl_op.ops->set_out_faults =
- axis2_wsdl_op_set_out_faults;
-
- wsdl_op_impl->wsdl_op.ops->get_output_msg =
- axis2_wsdl_op_get_output_msg;
-
- wsdl_op_impl->wsdl_op.ops->set_output_msg =
- axis2_wsdl_op_set_output_msg;
-
- wsdl_op_impl->wsdl_op.ops->is_safe =
- axis2_wsdl_op_is_safe;
-
- wsdl_op_impl->wsdl_op.ops->set_safety =
- axis2_wsdl_op_set_safety;
+ wsdl_op_impl->wsdl_op.ops->set_name = axis2_wsdl_op_set_name;
+ wsdl_op_impl->wsdl_op.ops->get_name = axis2_wsdl_op_get_name;
+ wsdl_op_impl->wsdl_op.ops->set_style = axis2_wsdl_op_set_style;
+ wsdl_op_impl->wsdl_op.ops->get_style = axis2_wsdl_op_get_style;
+ wsdl_op_impl->wsdl_op.ops->get_in_faults = axis2_wsdl_op_get_in_faults;
+ wsdl_op_impl->wsdl_op.ops->set_in_faults = axis2_wsdl_op_set_in_faults;
+ wsdl_op_impl->wsdl_op.ops->get_input_msg = axis2_wsdl_op_get_input_msg;
+ wsdl_op_impl->wsdl_op.ops->set_input_msg = axis2_wsdl_op_set_input_msg;
+ wsdl_op_impl->wsdl_op.ops->get_out_faults = axis2_wsdl_op_get_out_faults;
+ wsdl_op_impl->wsdl_op.ops->set_out_faults = axis2_wsdl_op_set_out_faults;
+ wsdl_op_impl->wsdl_op.ops->get_output_msg = axis2_wsdl_op_get_output_msg;
+ wsdl_op_impl->wsdl_op.ops->set_output_msg = axis2_wsdl_op_set_output_msg;
+ wsdl_op_impl->wsdl_op.ops->is_safe = axis2_wsdl_op_is_safe;
+ wsdl_op_impl->wsdl_op.ops->set_safety = axis2_wsdl_op_set_safety;
wsdl_op_impl->wsdl_op.ops->get_target_namespace =
axis2_wsdl_op_get_target_namespace;
- wsdl_op_impl->wsdl_op.ops->add_in_fault =
- axis2_wsdl_op_add_in_fault;
-
- wsdl_op_impl->wsdl_op.ops->add_out_fault =
- axis2_wsdl_op_add_out_fault;
+ wsdl_op_impl->wsdl_op.ops->add_in_fault = axis2_wsdl_op_add_in_fault;
+ wsdl_op_impl->wsdl_op.ops->add_out_fault = axis2_wsdl_op_add_out_fault;
return &(wsdl_op_impl->wsdl_op);
}
@@ -379,26 +348,35 @@
}
axis2_status_t AXIS2_CALL
-axis2_wsdl_op_set_msg_exchange_pattern (
- axis2_wsdl_op_t *wsdl_op,
+axis2_wsdl_op_set_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
axis2_env_t **env,
axis2_char_t *msg_exchange_pattern)
{
+ axis2_wsdl_op_impl_t *wsdl_op_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, msg_exchange_pattern, AXIS2_FAILURE);
- axis2_char_t *pattern_l = AXIS2_STRDUP(msg_exchange_pattern, env);
- if(NULL == pattern_l)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
+
+ if(wsdl_op_impl->msg_exchange_pattern)
+ {
+ AXIS2_FREE((*env)->allocator, wsdl_op_impl->msg_exchange_pattern);
+ wsdl_op_impl->msg_exchange_pattern = NULL;
+ }
+ wsdl_op_impl->msg_exchange_pattern = AXIS2_STRDUP(msg_exchange_pattern, env);
- AXIS2_INTF_TO_IMPL(wsdl_op)->msg_exchange_pattern = pattern_l;
+ if(NULL == wsdl_op_impl->msg_exchange_pattern)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}
axis2_char_t * AXIS2_CALL
-axis2_wsdl_op_get_msg_exchange_pattern (
- axis2_wsdl_op_t *wsdl_op,
+axis2_wsdl_op_get_msg_exchange_pattern (axis2_wsdl_op_t *wsdl_op,
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(wsdl_op, env, NULL);
@@ -459,7 +437,12 @@
AXIS2_FREE((*env)->allocator, wsdl_op_impl->style);
wsdl_op_impl->style = NULL;
}
- wsdl_op_impl->style = style;
+ wsdl_op_impl->style = AXIS2_STRDUP(style, env);
+ if(!wsdl_op_impl->style)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_property.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_property.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_property.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_property.c Thu Dec 15 20:06:29 2005
@@ -79,7 +79,7 @@
if(NULL == wsdl_property_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -92,7 +92,7 @@
if(NULL == wsdl_property_impl->wsdl_property.wsdl_component)
{
axis2_wsdl_property_free(&(wsdl_property_impl->wsdl_property), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -101,7 +101,7 @@
if(NULL == wsdl_property_impl->wsdl_property.ops)
{
axis2_wsdl_property_free(&(wsdl_property_impl->wsdl_property), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_soap_op.c Thu Dec 15 20:06:29 2005
@@ -73,7 +73,7 @@
if(NULL == soap_op_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -93,7 +93,7 @@
{
axis2_wsdl_soap_op_free(&(soap_op_impl->
soap_op), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/src/wsdl_svc.c Thu Dec 15 20:06:29 2005
@@ -103,7 +103,7 @@
sizeof(axis2_wsdl_svc_impl_t));
if(NULL == wsdl_svc_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -116,7 +116,7 @@
if(NULL == wsdl_svc_impl->wsdl_svc.wsdl_component)
{
axis2_wsdl_svc_free(&(wsdl_svc_impl->wsdl_svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY,AXIS2_FAILURE);
return NULL;
}
@@ -124,7 +124,7 @@
if(NULL == wsdl_svc_impl->endpoints)
{
axis2_wsdl_svc_free(&(wsdl_svc_impl->wsdl_svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -134,7 +134,7 @@
if(NULL == wsdl_svc_impl->wsdl_svc.ops)
{
axis2_wsdl_svc_free(&(wsdl_svc_impl->wsdl_svc), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -290,7 +290,9 @@
if (NULL == AXIS2_INTF_TO_IMPL(wsdl_svc)->qname)
{
/* Target Namespace not set and the Service Name is null */
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_SVC, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_SVC,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
}
return AXIS2_QNAME_GET_URI(AXIS2_INTF_TO_IMPL(wsdl_svc)->qname, env);
Modified: webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am Thu Dec 15 20:06:29 2005
@@ -12,7 +12,9 @@
axis2_om_processing_instruction.c \
axis2_om_stax_builder.c \
axis2_om_children_iterator.c \
- axis2_om_children_qname_iterator.c
+ axis2_om_children_qname_iterator.c \
+ axis2_om_child_element_iterator.c \
+ axis2_om_children_with_specific_attribute_iterator.c
libaxis2_om_la_LIBADD = $(LDFLAGS) ../../../util/src/libaxis2_util.la
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_child_element_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_child_element_iterator.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_child_element_iterator.c Thu Dec 15 20:06:29 2005
@@ -70,7 +70,7 @@
if(!iterator_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -88,7 +88,8 @@
if(!(iterator_impl->iterator.ops))
{
AXIS2_OM_CHILD_ELEMENT_ITERATOR_FREE(&(iterator_impl->iterator), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
iterator_impl->current_child = current_child;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_iterator.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_iterator.c Thu Dec 15 20:06:29 2005
@@ -65,7 +65,7 @@
if(!iterator_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -83,7 +83,8 @@
if(!(iterator_impl->iterator.ops))
{
AXIS2_OM_CHILDREN_ITERATOR_FREE(&(iterator_impl->iterator), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
iterator_impl->current_child = current_child;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_qname_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_qname_iterator.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_qname_iterator.c Thu Dec 15 20:06:29 2005
@@ -77,7 +77,7 @@
if(!iterator_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -97,7 +97,7 @@
if(!(iterator_impl->iterator.ops))
{
AXIS2_OM_CHILDREN_QNAME_ITERATOR_FREE(&(iterator_impl->iterator), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
Copied: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_with_specific_attribute_iterator.c (from r357112, webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children__with_specific_attribute_iterator.c)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_with_specific_attribute_iterator.c?p2=webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_with_specific_attribute_iterator.c&p1=webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children__with_specific_attribute_iterator.c&r1=357112&r2=357115&rev=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children__with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_children_with_specific_attribute_iterator.c Thu Dec 15 20:06:29 2005
@@ -80,7 +80,7 @@
if(!iterator_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -104,7 +104,8 @@
if(!(iterator_impl->iterator.ops))
{
AXIS2_OM_CHILDREN_WITH_SPECIFIC_ATTRIBUTE_ITERATOR_FREE(&(iterator_impl->iterator), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
iterator_impl->current_child = current_child;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Thu Dec 15 20:06:29 2005
@@ -65,7 +65,8 @@
*node = axis2_om_node_create (env);
if (!*node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
comment = (axis2_om_comment_impl_t *) AXIS2_MALLOC((*env)->allocator,
@@ -73,7 +74,8 @@
if (!comment)
{
AXIS2_FREE ((*env)->allocator, (*node));
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
comment->value = NULL;
@@ -85,7 +87,8 @@
{
AXIS2_FREE ((*env)->allocator,comment);
AXIS2_FREE ((*env)->allocator, (*node));
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
}
@@ -107,7 +110,8 @@
AXIS2_FREE ((*env)->allocator, comment);
AXIS2_FREE ((*env)->allocator, comment->value);
AXIS2_FREE ((*env)->allocator,*node);
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
comment->om_comment.ops->free = axis2_om_comment_free;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Thu Dec 15 20:06:29 2005
@@ -65,7 +65,8 @@
*node = axis2_om_node_create (env);
if (!*node)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY,NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
doctype = (axis2_om_doctype_impl_t *) AXIS2_MALLOC ((*env)->allocator,
@@ -74,7 +75,8 @@
if (!doctype)
{
AXIS2_FREE ((*env)->allocator, (*node));
- AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
doctype->value = NULL;
@@ -86,7 +88,8 @@
{
AXIS2_FREE ((*env)->allocator, doctype);
AXIS2_FREE ((*env)->allocator, (*node));
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
}
@@ -109,7 +112,8 @@
AXIS2_FREE((*env)->allocator, doctype);
AXIS2_FREE ((*env)->allocator, doctype->value);
AXIS2_FREE ((*env)->allocator, *node);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
doctype->om_doctype.ops->free = axis2_om_doctype_free;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c Thu Dec 15 20:06:29 2005
@@ -94,7 +94,10 @@
(*env)->allocator, sizeof (axis2_om_document_impl_t));
if (!document)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY,NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
document->builder = builder;
document->root_element = root;
@@ -108,7 +111,8 @@
if (!document->char_set_encoding)
{
AXIS2_FREE((*env)->allocator, document);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
document->xml_version = NULL;
@@ -118,7 +122,8 @@
AXIS2_FREE((*env)->allocator, document->char_set_encoding);
AXIS2_FREE((*env)->allocator, document);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
document->done = AXIS2_FALSE;
@@ -135,7 +140,8 @@
AXIS2_FREE((*env)->allocator, document->char_set_encoding);
AXIS2_FREE((*env)->allocator, document->xml_version);
AXIS2_FREE((*env)->allocator, document);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
document->om_document.ops->free = axis2_om_document_free;
@@ -255,7 +261,10 @@
return AXIS2_INTF_TO_IMPL(document)->root_element;
}
else
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL, AXIS2_FAILURE);
+ return NULL;
+ }
}
}
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=357115&r1=357114&r2=357115&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 Thu Dec 15 20:06:29 2005
@@ -392,6 +392,15 @@
AXIS2_FUNC_PARAM_CHECK(om_node,env,AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, parent, AXIS2_FAILURE);
+ if(!parent)
+ {
+
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+
+
if (parent == AXIS2_INTF_TO_IMPL(om_node)->parent)
{ /* same parent already exist */
return AXIS2_SUCCESS;
@@ -422,7 +431,7 @@
axis2_om_node_t *next_sib = NULL;
AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node_to_insert, AXIS2_FAILURE);
-
+
AXIS2_INTF_TO_IMPL(node_to_insert)->parent =
AXIS2_INTF_TO_IMPL(om_node)->parent;
AXIS2_INTF_TO_IMPL(node_to_insert)->prev_sibling = om_node;
@@ -449,7 +458,7 @@
AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, node_to_insert, AXIS2_FAILURE);
-
+
AXIS2_INTF_TO_IMPL(node_to_insert)->parent =
AXIS2_INTF_TO_IMPL(om_node)->parent ;
@@ -644,6 +653,7 @@
AXIS2_FUNC_PARAM_CHECK(om_node, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, prev_sibling, AXIS2_FAILURE);
+
AXIS2_INTF_TO_IMPL(om_node)->prev_sibling = prev_sibling;
return AXIS2_SUCCESS;
}
@@ -733,5 +743,3 @@
return NULL;
return AXIS2_OM_DOCUMENT_BUILD_NEXT(om_doc, env);
}
-
-
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=357115&r1=357114&r2=357115&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 Thu Dec 15 20:06:29 2005
@@ -50,7 +50,10 @@
sizeof (axis2_om_output_t));
if (!om_output)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
om_output->xml_writer = NULL;
om_output->xml_writer = xml_writer;
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=357115&r1=357114&r2=357115&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 Thu Dec 15 20:06:29 2005
@@ -71,12 +71,18 @@
AXIS2_ENV_CHECK(env,NULL);
if (!node || !target || !value)
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_INVALID_NULL_PARAM,NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
+ return NULL;
+ }
*node = axis2_om_node_create (env);
if (!*node)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
processing_instruction = (axis2_om_processing_instruction_impl_t *) AXIS2_MALLOC (
(*env)->allocator,sizeof(axis2_om_processing_instruction_impl_t));
@@ -84,7 +90,8 @@
if (!processing_instruction)
{
AXIS2_FREE ((*env)->allocator,(*node));
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
processing_instruction->value = NULL;
@@ -95,7 +102,8 @@
{
AXIS2_FREE ((*env)->allocator, processing_instruction);
AXIS2_FREE ((*env)->allocator , *node);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
}
@@ -109,7 +117,8 @@
AXIS2_FREE ((*env)->allocator, processing_instruction->value);
AXIS2_FREE ((*env)->allocator, processing_instruction);
AXIS2_FREE ((*env)->allocator, *node);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
}
AXIS2_OM_NODE_SET_DATA_ELEMENT(*node, env, processing_instruction);
@@ -132,7 +141,8 @@
AXIS2_FREE ((*env)->allocator, processing_instruction->target);
AXIS2_FREE ((*env)->allocator, processing_instruction);
AXIS2_FREE ((*env)->allocator, *node);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
processing_instruction->om_pi.ops->free =
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c Thu Dec 15 20:06:29 2005
@@ -95,7 +95,10 @@
(*env)->allocator, sizeof(axis2_om_stax_builder_impl_t));
if (!builder)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
builder->cache = AXIS2_TRUE;
builder->parser_accessed = AXIS2_FALSE;
@@ -115,7 +118,8 @@
{
AXIS2_XML_READER_FREE (builder->parser, env);
AXIS2_FREE ((*env)->allocator, builder);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
builder->om_stax_builder.ops->next =
@@ -210,13 +214,17 @@
builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
if (!builder->lastnode)
+ {
AXIS2_ERROR_SET((*env)->error,
- AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL,NULL);
+ AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL,AXIS2_FAILURE);
+ return NULL;
+ }
temp_value = AXIS2_XML_READER_GET_VALUE (builder->parser, env);
if (!temp_value)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_VALUE_NULL, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_VALUE_NULL, AXIS2_FAILURE);
+ return NULL;
}
if (AXIS2_OM_NODE_GET_BUILD_STATUS(builder->lastnode, env))
@@ -258,6 +266,7 @@
{
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
}
builder->cache = AXIS2_FALSE;
@@ -379,6 +388,7 @@
{
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_INVALID_DOCUMENT_STATE_UNDEFINED_NAMESPACE, AXIS2_FAILURE);
+ return AXIS2_FAILURE;
}
}
AXIS2_XML_READER_XML_FREE(builder->parser, env, temp_prefix);
@@ -399,7 +409,8 @@
if (!temp_localname)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
+ return NULL;
}
if (!(builder_impl->lastnode))
@@ -416,7 +427,7 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_BUILDER_NOT_ASSOCIATED_WITH_DOCUMENT, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_BUILDER_NOT_ASSOCIATED_WITH_DOCUMENT, AXIS2_FAILURE);
return NULL;
}
@@ -465,7 +476,8 @@
comment_value = AXIS2_XML_READER_GET_VALUE(builder_impl->parser, env);
if (!comment_value)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
+ return NULL;
}
if (!(builder_impl->lastnode))
@@ -545,7 +557,8 @@
value = AXIS2_XML_READER_GET_PI_DATA(builder_impl->parser, env);
if (!target)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_XML_READER_ELEMENT_NULL, AXIS2_FAILURE);
+ return NULL;
}
if (!(builder_impl->lastnode))
@@ -629,7 +642,10 @@
do
{
if (builder_impl->done)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL, AXIS2_FAILURE);
+ return NULL;
+ }
token = AXIS2_XML_READER_NEXT (builder_impl->parser, env);
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=357115&r1=357114&r2=357115&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 Thu Dec 15 20:06:29 2005
@@ -76,7 +76,10 @@
*node = axis2_om_node_create (env);
if (!(*node))
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
om_text = (axis2_om_text_impl_t *) AXIS2_MALLOC ((*env)->allocator,
@@ -85,7 +88,8 @@
if (!om_text)
{
AXIS2_FREE ((*env)->allocator, *node);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
om_text->value = NULL;
@@ -116,7 +120,8 @@
AXIS2_FREE ((*env)->allocator, om_text->value);
AXIS2_FREE ((*env)->allocator, om_text);
AXIS2_FREE ((*env)->allocator, *node);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
om_text->om_text.ops->free = axis2_om_text_free;
@@ -182,4 +187,3 @@
AXIS2_INTF_TO_IMPL(om_text)->value = (axis2_char_t*)AXIS2_STRDUP(value,env);
return AXIS2_SUCCESS;
}
-
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_reader_wrapper.c Thu Dec 15 20:06:29 2005
@@ -163,7 +163,10 @@
sizeof(guththila_xml_reader_wrapper_impl_t));
if(!guththila_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
allocator = guththila_allocator_init(NULL);
guththila_env = guththila_environment_create(allocator,NULL, NULL);
@@ -174,7 +177,8 @@
if(!(guththila_impl->reader))
{
AXIS2_FREE((*env)->allocator,guththila_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
guththila = guththila_xml_pull_parser_create(guththila_env,
@@ -182,7 +186,8 @@
if(!guththila)
{
AXIS2_FREE((*env)->allocator,guththila_impl);
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
@@ -195,7 +200,8 @@
if(!(guththila_impl->parser.ops))
{ guththila_xml_pull_parser_free( guththila_env, guththila);
AXIS2_FREE((*env)->allocator,guththila_impl);
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
@@ -256,7 +262,10 @@
sizeof(guththila_xml_reader_wrapper_impl_t));
if(!guththila_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
allocator = guththila_allocator_init(NULL);
guththila_env = guththila_environment_create(allocator,NULL, NULL);
@@ -268,7 +277,8 @@
if(!(guththila_impl->reader))
{
AXIS2_FREE((*env)->allocator,guththila_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
guththila = guththila_xml_pull_parser_create(guththila_env,
@@ -276,7 +286,8 @@
if(!guththila)
{
AXIS2_FREE((*env)->allocator,guththila_impl);
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
@@ -289,7 +300,8 @@
if(!(guththila_impl->parser.ops))
{ guththila_xml_pull_parser_free( guththila_env, guththila);
AXIS2_FREE((*env)->allocator,guththila_impl);
- AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/src/guththila_xml_writer_wrapper.c Thu Dec 15 20:06:29 2005
@@ -233,7 +233,10 @@
writer_impl = (guththila_xml_writer_wrapper_impl_t *)AXIS2_MALLOC((*env)->allocator,
sizeof(guththila_xml_writer_wrapper_impl_t));
if(!writer_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
allocator = guththila_allocator_init(NULL);
@@ -248,7 +251,8 @@
{
AXIS2_FREE((*env)->allocator,writer_impl);
AXIS2_FREE((*env)->allocator,allocator);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
writer_impl->writer.ops = NULL;
@@ -259,7 +263,8 @@
AXIS2_FREE((*env)->allocator,writer_impl);
AXIS2_FREE((*env)->allocator,allocator);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
/* ops */
writer_impl->writer.ops->free = guththila_xml_writer_wrapper_free;
@@ -786,5 +791,4 @@
axis2_env_t **env)
{
return NULL;
-}
-
+}
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_reader_wrapper.c Thu Dec 15 20:06:29 2005
@@ -199,14 +199,17 @@
wrapper_impl = (axis2_libxml2_reader_wrapper_impl_t*)AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_libxml2_reader_wrapper_impl_t));
if(!wrapper_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
wrapper_impl->reader = xmlNewTextReaderFilename(filename);
if(!(wrapper_impl->reader))
{
AXIS2_FREE((*env)->allocator, wrapper_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CREATING_XML_STREAM_READER, NULL);
-
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CREATING_XML_STREAM_READER, AXIS2_FAILURE);
+ return NULL;
}
@@ -223,7 +226,8 @@
{
xmlFreeTextReader(wrapper_impl->reader);
AXIS2_FREE((*env)->allocator, wrapper_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
/* ops */
@@ -285,7 +289,7 @@
sizeof(axis2_libxml2_reader_wrapper_impl_t));
if(!wrapper_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -297,7 +301,8 @@
if(!(wrapper_impl->reader))
{
AXIS2_FREE((*env)->allocator, wrapper_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CREATING_XML_STREAM_READER, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CREATING_XML_STREAM_READER, AXIS2_FAILURE);
+ return NULL;
}
@@ -314,7 +319,8 @@
{
xmlFreeTextReader(wrapper_impl->reader);
AXIS2_FREE((*env)->allocator, wrapper_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c?rev=357115&r1=357114&r2=357115&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c Thu Dec 15 20:06:29 2005
@@ -271,14 +271,18 @@
writer_impl = (axis2_libxml2_writer_wrapper_impl_t *)AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_libxml2_writer_wrapper_impl_t));
if(!writer_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
writer_impl->xml_writer = xmlNewTextWriterFilename(filename, compression);
if(!(writer_impl->xml_writer))
{
- AXIS2_ERROR_SET((*env)->error,
- AXIS2_ERROR_CREATING_XML_STREAM_WRITER, NULL);
AXIS2_FREE((*env)->allocator, writer_impl);
+ AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_CREATING_XML_STREAM_WRITER, AXIS2_FAILURE);
+ return NULL;
}
writer_impl->buffer = NULL;
@@ -299,7 +303,7 @@
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -319,7 +323,8 @@
if(!(writer_impl->writer.ops))
{
AXIS2_FREE((*env)->allocator,writer_impl);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
/* ops */
writer_impl->writer.ops->free = axis2_libxml2_writer_wrapper_free;
@@ -395,7 +400,10 @@
writer_impl = (axis2_libxml2_writer_wrapper_impl_t *)AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_libxml2_writer_wrapper_impl_t));
if(!writer_impl)
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
writer_impl->writer.ops = NULL;
writer_impl->encoding = NULL;
@@ -409,7 +417,7 @@
if(writer_impl->buffer == NULL)
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -417,7 +425,7 @@
if(writer_impl->xml_writer == NULL)
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CREATING_XML_STREAM_WRITER , NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_CREATING_XML_STREAM_WRITER , AXIS2_FAILURE);
return NULL;
}
@@ -435,7 +443,7 @@
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -451,7 +459,8 @@
if(!(writer_impl->writer.ops))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
}
/* ops */
@@ -780,7 +789,7 @@
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_WRITING_END_ELEMENT,
AXIS2_FAILURE);
- return AXIS2_FAILURE;
+ return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
}