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 sa...@apache.org on 2006/09/19 03:39:11 UTC
svn commit: r447671 [4/8] - in /webservices/axis2/trunk/c:
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/
guththila/src/ modules/core/addr/ modules/core/clientapi/ modules/...
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Mon Sep 18 18:39:03 2006
@@ -78,7 +78,7 @@
msg_uuid = axis2_uuid_gen(env);
AXIS2_MSG_INFO_HEADERS_SET_MESSAGE_ID(msg_info_headers, env, msg_uuid);
- if (NULL != msg_uuid)
+ if (msg_uuid)
{
AXIS2_FREE(env->allocator, msg_uuid);
msg_uuid = NULL;
@@ -207,7 +207,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- if (version != NULL && 0 != AXIS2_STRLEN(version))
+ if (version && 0 != AXIS2_STRLEN(version))
{
axis2_char_t * mod_name1 = NULL;
axis2_char_t * mod_name = NULL;
@@ -249,22 +249,22 @@
{
return AXIS2_FAILURE;
}
- for (hi = axis2_hash_first(modules_map, env); NULL != hi;
+ for (hi = axis2_hash_first(modules_map, env); hi;
hi = axis2_hash_next(env, hi))
{
axis2_module_desc_t *mod_desc = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
mod_desc = (axis2_module_desc_t *) val;
- if (NULL != mod_desc)
+ if (mod_desc)
{
const axis2_qname_t *module_qname = NULL;
module_qname = AXIS2_MODULE_DESC_GET_QNAME(mod_desc, env);
- if (NULL != module_qname)
+ if (module_qname)
{
axis2_char_t *mod_name_with_ver = NULL;
mod_name_with_ver = AXIS2_QNAME_GET_LOCALPART(module_qname, env);
- if (NULL != mod_name_with_ver)
+ if (mod_name_with_ver)
{
axis2_char_t *module_name_str = NULL;
axis2_char_t *module_ver_str = NULL;
@@ -280,9 +280,9 @@
mod_name_with_ver);
current_def_ver = axis2_hash_get(default_modules,
module_name_str, AXIS2_HASH_KEY_STRING);
- if (NULL != current_def_ver)
+ if (current_def_ver)
{
- if (NULL != module_ver_str && AXIS2_TRUE ==
+ if (module_ver_str && AXIS2_TRUE ==
axis2_core_utils_is_latest_mod_ver(env,
module_ver_str, current_def_ver))
{
@@ -291,12 +291,12 @@
}
else
{
- if (NULL != module_name_str)
+ if (module_name_str)
{
AXIS2_FREE(env->allocator, module_name_str);
module_name_str = NULL;
}
- if (NULL != module_ver_str)
+ if (module_ver_str)
{
AXIS2_FREE(env->allocator, module_ver_str);
module_ver_str = NULL;
@@ -316,12 +316,12 @@
hi = NULL;
val = NULL;
- for (hi = axis2_hash_first(default_modules, env); NULL != hi;
+ for (hi = axis2_hash_first(default_modules, env); hi;
hi = axis2_hash_next(env, hi))
{
void *key_string = NULL;
axis2_hash_this(hi, (const void **)&key_string, NULL, &val);
- if (NULL != key_string && NULL != val)
+ if (key_string && NULL != val)
{
AXIS2_CONF_ADD_DEFAULT_MODULE_VERSION(axis_conf, env,
(axis2_char_t *)key_string, (axis2_char_t *)val);
@@ -349,7 +349,7 @@
return NULL;
}
version_sep_loc = AXIS2_RINDEX(name, version_seperator);
- if (NULL != version_sep_loc)
+ if (version_sep_loc)
{
*version_sep_loc = '\0';
}
@@ -366,7 +366,7 @@
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
version_sep_loc = AXIS2_RINDEX(module_name, version_seperator);
- if (NULL != version_sep_loc)
+ if (version_sep_loc)
{
return AXIS2_STRDUP(version_sep_loc + sizeof(axis2_char_t), env);
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Mon Sep 18 18:39:03 2006
@@ -154,7 +154,7 @@
addr_ns = AXIS2_WSA_NAMESPACE_SUBMISSION;
}
}
- else if (AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env) != NULL)
+ else if (AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env))
{
axis2_op_ctx_t *op_ctx = NULL;
axis2_msg_ctx_t *in_msg_ctx = NULL;
@@ -338,7 +338,7 @@
/* It is wrong freeing the epr here. Instead I set the locally
* created epr to msg_info_headers just after creating it
*/
- /*if(NULL != epr)
+ /*if( epr)
{
AXIS2_ENDPOINT_REF_FREE(epr, env);
epr = NULL;
@@ -422,11 +422,11 @@
(axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(relates_to_header_node,
env);
- if (NULL != relates_to_header_ele)
+ if (relates_to_header_ele)
{
dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(relates_to_header_ele, env,
addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- if (NULL != dec_ns)
+ if (dec_ns)
{
addr_ns_obj = dec_ns;
}
@@ -444,7 +444,7 @@
om_attr, relates_to_header_node);
}
- if (NULL != relates_to_header_ele)
+ if (relates_to_header_ele)
{
dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(relates_to_header_ele, env,
addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
@@ -452,7 +452,7 @@
{
dec_ns = AXIOM_ELEMENT_FIND_NAMESPACE(relates_to_header_ele, env,
relates_to_header_node, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
- if (NULL != dec_ns)
+ if (dec_ns)
{
AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
addr_ns_obj = NULL ;
@@ -503,7 +503,7 @@
header_block_ele =
(axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(header_block_node, env);
- if (NULL != header_block_ele)
+ if (header_block_ele)
{
axiom_namespace_t *dec_ns = NULL;
AXIOM_ELEMENT_SET_TEXT(header_block_ele, env, value,
@@ -550,7 +550,7 @@
AXIOM_SOAP_HEADER_ADD_HEADER_BLOCK(soap_header, env, type,
addr_ns_obj);
- if (NULL != addr_ns_obj)
+ if (addr_ns_obj)
{
AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
addr_ns_obj = NULL;
@@ -572,7 +572,7 @@
address_ele =
axiom_element_create(env, hb_node, EPR_ADDRESS, addr_ns_obj,
&address_node);
- if (NULL != address_ele)
+ if (address_ele)
{
axiom_namespace_t *dec_ns = NULL;
AXIOM_ELEMENT_SET_TEXT(address_ele, env, address, address_node);
@@ -705,7 +705,7 @@
referece_properties,
reference_node,
addr_ns);
- if(NULL != reference_ele)
+ if( reference_ele)
{
axiom_namespace_t *dec_ns = NULL;
dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE( reference_ele , env,
@@ -777,7 +777,7 @@
sprintf(text, "%s:%s", qname_prefix, qname_localpart);
AXIOM_ELEMENT_SET_TEXT(interface_ele, env, text, interface_node);
AXIS2_FREE(env->allocator, text);
- if (NULL != interface_ele)
+ if (interface_ele)
{
axiom_namespace_t *dec_ns = NULL;
dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(interface_ele , env,
Modified: webservices/axis2/trunk/c/modules/wsdl/builder/wsdl_pump.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/builder/wsdl_pump.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/builder/wsdl_pump.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/builder/wsdl_pump.c Mon Sep 18 18:39:03 2006
@@ -282,7 +282,7 @@
pump_impl = AXIS2_INTF_TO_IMPL(wsdl_pump);
- if (NULL != wsdl_pump->ops)
+ if (wsdl_pump->ops)
AXIS2_FREE(env->allocator, wsdl_pump->ops);
AXIS2_FREE(env->allocator, pump_impl);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_binding.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_binding.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_binding.c Mon Sep 18 18:39:03 2006
@@ -230,25 +230,25 @@
binding_impl = AXIS2_INTF_TO_IMPL(wsdl_binding);
- if (NULL != wsdl_binding->ops)
+ if (wsdl_binding->ops)
{
AXIS2_FREE(env->allocator, wsdl_binding->ops);
wsdl_binding->ops = NULL;
}
- if (NULL != binding_impl->qname)
+ if (binding_impl->qname)
{
AXIS2_QNAME_FREE(AXIS2_INTF_TO_IMPL(wsdl_binding)->qname, env);
binding_impl->qname = NULL;
}
- if (NULL != binding_impl->bound_interface)
+ if (binding_impl->bound_interface)
{
AXIS2_WSDL_INTERFACE_FREE(binding_impl->bound_interface, env);
binding_impl->bound_interface = NULL;
}
- if (NULL != binding_impl->binding_faults)
+ if (binding_impl->binding_faults)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -269,7 +269,7 @@
binding_impl->binding_faults = NULL;
}
- if (NULL != binding_impl->binding_ops)
+ if (binding_impl->binding_ops)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -292,7 +292,7 @@
binding_impl->binding_ops = NULL;
}
- if (NULL != wsdl_binding->extensible_component)
+ if (wsdl_binding->extensible_component)
{
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_binding->
extensible_component, env);
@@ -393,7 +393,7 @@
binding_impl = AXIS2_INTF_TO_IMPL(wsdl_binding);
- if (NULL != binding_impl->binding_faults)
+ if (binding_impl->binding_faults)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -436,7 +436,7 @@
AXIS2_PARAM_CHECK(env->error, binding_ops, AXIS2_FAILURE);
binding_impl = AXIS2_INTF_TO_IMPL(wsdl_binding);
- if (NULL != binding_impl->binding_ops)
+ if (binding_impl->binding_ops)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_fault.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_fault.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_fault.c Mon Sep 18 18:39:03 2006
@@ -113,19 +113,19 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
binding_fault_impl = AXIS2_INTF_TO_IMPL(binding_fault);
- if (NULL != binding_fault->ops)
+ if (binding_fault->ops)
{
AXIS2_FREE(env->allocator, binding_fault->ops);
binding_fault->ops = NULL;
}
- if (NULL != binding_fault_impl->ref)
+ if (binding_fault_impl->ref)
{
AXIS2_QNAME_FREE(binding_fault_impl->ref, env);
binding_fault_impl->ref = NULL;
}
- if (NULL != binding_fault->extensible_component)
+ if (binding_fault->extensible_component)
{
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(binding_fault->extensible_component, env);
binding_fault->extensible_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_msg_ref.c Mon Sep 18 18:39:03 2006
@@ -140,25 +140,25 @@
binding_msg_ref_impl = AXIS2_INTF_TO_IMPL(binding_msg_ref);
- if (NULL != binding_msg_ref->ops)
+ if (binding_msg_ref->ops)
{
AXIS2_FREE(env->allocator, binding_msg_ref->ops);
binding_msg_ref->ops = NULL;
}
- if (NULL != binding_msg_ref_impl->msg_label)
+ if (binding_msg_ref_impl->msg_label)
{
AXIS2_FREE(env->allocator, binding_msg_ref_impl->msg_label);
binding_msg_ref_impl->msg_label = NULL;
}
- if (NULL != binding_msg_ref_impl->direction)
+ if (binding_msg_ref_impl->direction)
{
AXIS2_FREE(env->allocator, binding_msg_ref_impl->direction);
binding_msg_ref_impl->direction = NULL;
}
- if (NULL != binding_msg_ref->extensible_component)
+ if (binding_msg_ref->extensible_component)
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(binding_msg_ref->
extensible_component, env);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_op.c Mon Sep 18 18:39:03 2006
@@ -254,13 +254,13 @@
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
- if (NULL != binding_op->ops)
+ if (binding_op->ops)
{
AXIS2_FREE(env->allocator, binding_op->ops);
binding_op->ops = NULL;
}
- if (NULL != binding_op_impl->in_faults)
+ if (binding_op_impl->in_faults)
{
void *val = NULL;
int i = 0;
@@ -281,7 +281,7 @@
binding_op_impl->in_faults = NULL;
}
- if (NULL != binding_op_impl->out_faults)
+ if (binding_op_impl->out_faults)
{
void *val = NULL;
int i = 0;
@@ -302,7 +302,7 @@
binding_op_impl->out_faults = NULL;
}
- if (NULL != binding_op->extensible_component)
+ if (binding_op->extensible_component)
{
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(binding_op->
extensible_component, env);
@@ -364,7 +364,7 @@
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
- if (NULL != binding_op_impl->op)
+ if (binding_op_impl->op)
{
axis2_wsdl_op_free_void_arg(op, env);
binding_op_impl->op = NULL;
@@ -478,7 +478,7 @@
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
- if (NULL != binding_op_impl->out_faults)
+ if (binding_op_impl->out_faults)
{
void *val = NULL;
int i = 0;
@@ -522,7 +522,7 @@
binding_op_impl = AXIS2_INTF_TO_IMPL(binding_op);
- if (NULL != binding_op_impl->out_faults)
+ if (binding_op_impl->out_faults)
{
void *val = NULL;
int i = 0;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c Mon Sep 18 18:39:03 2006
@@ -152,13 +152,13 @@
component_impl = AXIS2_INTF_TO_IMPL(wsdl_component);
- if (NULL != wsdl_component->ops)
+ if (wsdl_component->ops)
{
AXIS2_FREE(env->allocator, wsdl_component->ops);
wsdl_component->ops = NULL;
}
- if (NULL != component_impl->component_properties)
+ if (component_impl->component_properties)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -184,13 +184,13 @@
component_impl->component_properties = NULL;
}
- if (NULL != component_impl->attributes)
+ if (component_impl->attributes)
{
AXIS2_LINKED_LIST_FREE(component_impl->attributes, env);
component_impl->attributes = NULL;
}
- if (NULL != component_impl->elements)
+ if (component_impl->elements)
{
AXIS2_LINKED_LIST_FREE(component_impl->elements, env);
component_impl->elements = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_endpoint.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_endpoint.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_endpoint.c Mon Sep 18 18:39:03 2006
@@ -129,25 +129,25 @@
wsdl_endpoint_impl = AXIS2_INTF_TO_IMPL(wsdl_endpoint);
- if (NULL != wsdl_endpoint->ops)
+ if (wsdl_endpoint->ops)
{
AXIS2_FREE(env->allocator, wsdl_endpoint->ops);
wsdl_endpoint->ops = NULL;
}
- if (NULL != AXIS2_INTF_TO_IMPL(wsdl_endpoint)->qname)
+ if (AXIS2_INTF_TO_IMPL(wsdl_endpoint)->qname)
{
AXIS2_FREE(env->allocator, wsdl_endpoint_impl->qname);
wsdl_endpoint_impl->qname = NULL;
}
- if (NULL != AXIS2_INTF_TO_IMPL(wsdl_endpoint)->wsdl_binding)
+ if (AXIS2_INTF_TO_IMPL(wsdl_endpoint)->wsdl_binding)
{
AXIS2_WSDL_BINDING_FREE(wsdl_endpoint_impl->wsdl_binding, env);
wsdl_endpoint_impl->wsdl_binding = NULL;
}
- if (NULL != wsdl_endpoint->wsdl_component)
+ if (wsdl_endpoint->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(wsdl_endpoint->wsdl_component, env);
wsdl_endpoint->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_address.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_address.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_address.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_address.c Mon Sep 18 18:39:03 2006
@@ -118,10 +118,10 @@
ext_soap_address_impl = AXIS2_INTF_TO_IMPL(ext_soap_address);
- if (NULL != ext_soap_address->ops)
+ if (ext_soap_address->ops)
AXIS2_FREE(env->allocator, ext_soap_address->ops);
- if (NULL != ext_soap_address_impl->location_uri)
+ if (ext_soap_address_impl->location_uri)
{
AXIS2_FREE(env->allocator, ext_soap_address_impl->location_uri);
ext_soap_address_impl->location_uri = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_binding.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_binding.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_binding.c Mon Sep 18 18:39:03 2006
@@ -132,22 +132,22 @@
exp_soap_binding_impl = AXIS2_INTF_TO_IMPL(ext_soap_binding);
- if (NULL != ext_soap_binding->ops)
+ if (ext_soap_binding->ops)
AXIS2_FREE(env->allocator, ext_soap_binding->ops);
- if (NULL != exp_soap_binding_impl->style)
+ if (exp_soap_binding_impl->style)
{
AXIS2_FREE(env->allocator, exp_soap_binding_impl->style);
exp_soap_binding_impl->style = NULL;
}
- if (NULL != exp_soap_binding_impl->transport_uri)
+ if (exp_soap_binding_impl->transport_uri)
{
AXIS2_FREE(env->allocator, exp_soap_binding_impl->transport_uri);
exp_soap_binding_impl->transport_uri = NULL;
}
- if (NULL != ext_soap_binding->ext_element)
+ if (ext_soap_binding->ext_element)
{
AXIS2_WSDL_EXTENSIBLE_ELEMENT_FREE(ext_soap_binding->ext_element, env);
ext_soap_binding->ext_element = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_body.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_body.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_body.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_body.c Mon Sep 18 18:39:03 2006
@@ -132,22 +132,22 @@
exp_soap_body_impl = AXIS2_INTF_TO_IMPL(ext_soap_body);
- if (NULL != ext_soap_body->ops)
+ if (ext_soap_body->ops)
AXIS2_FREE(env->allocator, ext_soap_body->ops);
- if (NULL != exp_soap_body_impl->use)
+ if (exp_soap_body_impl->use)
{
AXIS2_FREE(env->allocator, exp_soap_body_impl->use);
exp_soap_body_impl->use = NULL;
}
- if (NULL != exp_soap_body_impl->namespc_uri)
+ if (exp_soap_body_impl->namespc_uri)
{
AXIS2_FREE(env->allocator, exp_soap_body_impl->namespc_uri);
exp_soap_body_impl->namespc_uri = NULL;
}
- if (NULL != ext_soap_body->ext_element)
+ if (ext_soap_body->ext_element)
{
AXIS2_WSDL_EXTENSIBLE_ELEMENT_FREE(ext_soap_body->ext_element, env);
ext_soap_body->ext_element = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_header.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_header.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_header.c Mon Sep 18 18:39:03 2006
@@ -149,28 +149,28 @@
exp_soap_header_impl = AXIS2_INTF_TO_IMPL(ext_soap_header);
- if (NULL != ext_soap_header->ops)
+ if (ext_soap_header->ops)
AXIS2_FREE(env->allocator, ext_soap_header->ops);
- if (NULL != exp_soap_header_impl->part)
+ if (exp_soap_header_impl->part)
{
AXIS2_FREE(env->allocator, exp_soap_header_impl->part);
exp_soap_header_impl->part = NULL;
}
- if (NULL != exp_soap_header_impl->msg_qname)
+ if (exp_soap_header_impl->msg_qname)
{
AXIS2_QNAME_FREE(exp_soap_header_impl->msg_qname, env);
exp_soap_header_impl->msg_qname = NULL;
}
- if (NULL != exp_soap_header_impl->qelement)
+ if (exp_soap_header_impl->qelement)
{
AXIS2_QNAME_FREE(exp_soap_header_impl->qelement, env);
exp_soap_header_impl->qelement = NULL;
}
- if (NULL != ext_soap_header->ext_soap_body)
+ if (ext_soap_header->ext_soap_body)
{
AXIS2_WSDL_EXT_SOAP_BODY_FREE(ext_soap_header->ext_soap_body, env);
ext_soap_header->ext_soap_body = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_op.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_ext_soap_op.c Mon Sep 18 18:39:03 2006
@@ -132,22 +132,22 @@
exp_soap_op_impl = AXIS2_INTF_TO_IMPL(ext_soap_op);
- if (NULL != ext_soap_op->ops)
+ if (ext_soap_op->ops)
AXIS2_FREE(env->allocator, ext_soap_op->ops);
- if (NULL != exp_soap_op_impl->soap_action)
+ if (exp_soap_op_impl->soap_action)
{
AXIS2_FREE(env->allocator, exp_soap_op_impl->soap_action);
exp_soap_op_impl->soap_action = NULL;
}
- if (NULL != exp_soap_op_impl->style)
+ if (exp_soap_op_impl->style)
{
AXIS2_FREE(env->allocator, exp_soap_op_impl->style);
exp_soap_op_impl->style = NULL;
}
- if (NULL != ext_soap_op->ext_element)
+ if (ext_soap_op->ext_element)
{
AXIS2_WSDL_EXTENSIBLE_ELEMENT_FREE(ext_soap_op->ext_element, env);
ext_soap_op->ext_element = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_attribute.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_attribute.c Mon Sep 18 18:39:03 2006
@@ -120,17 +120,17 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != extensible_attribute->ops)
+ if (extensible_attribute->ops)
AXIS2_FREE(env->allocator, extensible_attribute->ops);
- if (NULL != AXIS2_INTF_TO_IMPL(extensible_attribute)->key)
+ if (AXIS2_INTF_TO_IMPL(extensible_attribute)->key)
{
AXIS2_QNAME_FREE(AXIS2_INTF_TO_IMPL(extensible_attribute)->
key, env);
AXIS2_INTF_TO_IMPL(extensible_attribute)->key = NULL;
}
- if (NULL != AXIS2_INTF_TO_IMPL(extensible_attribute)->value)
+ if (AXIS2_INTF_TO_IMPL(extensible_attribute)->value)
{
AXIS2_QNAME_FREE(AXIS2_INTF_TO_IMPL(extensible_attribute)->
value, env);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_component.c Mon Sep 18 18:39:03 2006
@@ -160,13 +160,13 @@
extensible_component_impl = AXIS2_INTF_TO_IMPL(extensible_component);
- if (NULL != extensible_component->ops)
+ if (extensible_component->ops)
{
AXIS2_FREE(env->allocator, extensible_component->ops);
extensible_component->ops = NULL;
}
- if (NULL != extensible_component_impl->features)
+ if (extensible_component_impl->features)
{
void *val = NULL;
int i = 0;
@@ -187,7 +187,7 @@
extensible_component_impl->features = NULL;
}
- if (NULL != extensible_component_impl->properties)
+ if (extensible_component_impl->properties)
{
void *val = NULL;
int i = 0;
@@ -208,7 +208,7 @@
extensible_component_impl->properties = NULL;
}
- if (NULL != extensible_component->wsdl_component)
+ if (extensible_component->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(extensible_component->wsdl_component, env);
extensible_component->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_element.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_element.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_element.c Mon Sep 18 18:39:03 2006
@@ -119,10 +119,10 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != extensible_element->ops)
+ if (extensible_element->ops)
AXIS2_FREE(env->allocator, extensible_element->ops);
- if (NULL != AXIS2_INTF_TO_IMPL(extensible_element)->type)
+ if (AXIS2_INTF_TO_IMPL(extensible_element)->type)
{
AXIS2_QNAME_FREE(AXIS2_INTF_TO_IMPL(extensible_element)->
type, env);
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_fault_ref.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_fault_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_fault_ref.c Mon Sep 18 18:39:03 2006
@@ -155,31 +155,31 @@
fault_ref_impl = AXIS2_INTF_TO_IMPL(fault_ref);
- if (NULL != fault_ref->ops)
+ if (fault_ref->ops)
{
AXIS2_FREE(env->allocator, fault_ref->ops);
fault_ref->ops = NULL;
}
- if (NULL != fault_ref_impl->msg_label)
+ if (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 != fault_ref_impl->direction)
+ if (fault_ref_impl->direction)
{
AXIS2_FREE(env->allocator, fault_ref_impl->direction);
fault_ref_impl->direction = NULL;
}
- if (NULL != fault_ref_impl->ref)
+ if (fault_ref_impl->ref)
{
AXIS2_QNAME_FREE(fault_ref_impl->ref, env);
fault_ref_impl->ref = NULL;
}
- if (NULL != fault_ref->wsdl_component)
+ if (fault_ref->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(fault_ref->wsdl_component, env);
fault_ref->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_feature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_feature.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_feature.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_feature.c Mon Sep 18 18:39:03 2006
@@ -122,16 +122,16 @@
feature_impl = AXIS2_INTF_TO_IMPL(wsdl_feature);
- if (NULL != wsdl_feature->ops)
+ if (wsdl_feature->ops)
AXIS2_FREE(env->allocator, wsdl_feature->ops);
- if (NULL != feature_impl->name)
+ if (feature_impl->name)
{
AXIS2_FREE(env->allocator, feature_impl->name);
feature_impl->name = NULL;
}
- if (NULL != wsdl_feature->wsdl_component)
+ if (wsdl_feature->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(wsdl_feature->wsdl_component, env);
wsdl_feature->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_import.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_import.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_import.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_import.c Mon Sep 18 18:39:03 2006
@@ -119,22 +119,22 @@
import_impl = AXIS2_INTF_TO_IMPL(wsdl_import);
- if (NULL != wsdl_import->ops)
+ if (wsdl_import->ops)
AXIS2_FREE(env->allocator, wsdl_import->ops);
- if (NULL != import_impl->namespace)
+ if (import_impl->namespace)
{
AXIS2_FREE(env->allocator, import_impl->namespace);
import_impl->namespace = NULL;
}
- if (NULL != import_impl->location)
+ if (import_impl->location)
{
AXIS2_FREE(env->allocator, import_impl->location);
import_impl->location = NULL;
}
- if (NULL != wsdl_import->wsdl_component)
+ if (wsdl_import->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(wsdl_import->wsdl_component, env);
wsdl_import->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_include.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_include.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_include.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_include.c Mon Sep 18 18:39:03 2006
@@ -107,16 +107,16 @@
include_impl = AXIS2_INTF_TO_IMPL(wsdl_include);
- if (NULL != wsdl_include->ops)
+ if (wsdl_include->ops)
AXIS2_FREE(env->allocator, wsdl_include->ops);
- if (NULL != include_impl->location)
+ if (include_impl->location)
{
AXIS2_FREE(env->allocator, include_impl->location);
include_impl->location = NULL;
}
- if (NULL != wsdl_include->wsdl_component)
+ if (wsdl_include->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(wsdl_include->wsdl_component, env);
wsdl_include->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c Mon Sep 18 18:39:03 2006
@@ -139,23 +139,23 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
msg_ref_impl = AXIS2_INTF_TO_IMPL(msg_ref);
- if (NULL != msg_ref->ops)
+ if (msg_ref->ops)
{
AXIS2_FREE(env->allocator, msg_ref->ops);
}
- if (NULL != msg_ref_impl->msg_label)
+ if (msg_ref_impl->msg_label)
{
AXIS2_FREE(env->allocator, msg_ref_impl->msg_label);
}
- if (NULL != msg_ref_impl->msg_label)
+ if (msg_ref_impl->msg_label)
{
AXIS2_FREE(env->allocator, msg_ref_impl->msg_label);
}
- if (NULL != msg_ref_impl->element)
+ if (msg_ref_impl->element)
{
AXIS2_QNAME_FREE(msg_ref_impl->element, env);
}
- if (NULL != msg_ref->extensible_component)
+ if (msg_ref->extensible_component)
{
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(msg_ref->extensible_component, env);
}
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c Mon Sep 18 18:39:03 2006
@@ -260,14 +260,14 @@
wsdl_op_impl = AXIS2_INTF_TO_IMPL(wsdl_op);
- if (NULL != wsdl_op->extensible_component)
+ if (wsdl_op->extensible_component)
{
AXIS2_WSDL_EXTENSIBLE_COMPONENT_FREE(wsdl_op->extensible_component, env);
wsdl_op->extensible_component = NULL;
}
- if (NULL != wsdl_op_impl->in_faults)
+ if (wsdl_op_impl->in_faults)
{
void *val = NULL;
int i = 0;
@@ -288,7 +288,7 @@
wsdl_op_impl->in_faults = NULL;
}
- if (NULL != wsdl_op_impl->out_faults)
+ if (wsdl_op_impl->out_faults)
{
void *val = NULL;
int i = 0;
@@ -312,7 +312,7 @@
wsdl_op_impl->out_faults = NULL;
}
- if (NULL != wsdl_op_impl->name)
+ if (wsdl_op_impl->name)
{
AXIS2_QNAME_FREE(wsdl_op_impl->name, env);
wsdl_op_impl->name = NULL;
@@ -324,13 +324,13 @@
wsdl_op_impl->msg_exchange_pattern = NULL;
}
- if (NULL != wsdl_op_impl->style)
+ if (wsdl_op_impl->style)
{
AXIS2_FREE(env->allocator, wsdl_op_impl->style);
wsdl_op_impl->style = NULL;
}
- if (NULL != wsdl_op->ops)
+ if (wsdl_op->ops)
{
AXIS2_FREE(env->allocator, wsdl_op->ops);
wsdl_op->ops = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c Mon Sep 18 18:39:03 2006
@@ -132,12 +132,12 @@
axis2_wsdl_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != wsdl_property->ops)
+ if (wsdl_property->ops)
AXIS2_FREE(env->allocator, wsdl_property->ops);
property_impl = AXIS2_INTF_TO_IMPL(wsdl_property);
- if (NULL != property_impl->name)
+ if (property_impl->name)
{
AXIS2_FREE(env->allocator, property_impl->name);
property_impl->name = NULL;
@@ -147,7 +147,7 @@
property_impl->value = NULL;
- if (NULL != wsdl_property->wsdl_component)
+ if (wsdl_property->wsdl_component)
{
AXIS2_WSDL_COMPONENT_FREE(wsdl_property->wsdl_component, env);
wsdl_property->wsdl_component = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c Mon Sep 18 18:39:03 2006
@@ -142,19 +142,19 @@
soap_op_impl = AXIS2_INTF_TO_IMPL(soap_op);
- if (NULL != soap_op->ops)
+ if (soap_op->ops)
{
AXIS2_FREE(env->allocator, soap_op->ops);
soap_op->ops = NULL;
}
- if (NULL != soap_op_impl->style)
+ if (soap_op_impl->style)
{
AXIS2_FREE(env->allocator, soap_op_impl->style);
soap_op_impl->style = NULL;
}
- if (NULL != soap_op_impl->soap_action)
+ if (soap_op_impl->soap_action)
{
AXIS2_FREE(env->allocator, soap_op_impl->soap_action);
soap_op_impl->soap_action = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c Mon Sep 18 18:39:03 2006
@@ -196,7 +196,7 @@
wsdl_svc_impl->svc_interface = NULL;
}
- if (NULL != AXIS2_INTF_TO_IMPL(wsdl_svc)->qname)
+ if (AXIS2_INTF_TO_IMPL(wsdl_svc)->qname)
{
AXIS2_QNAME_FREE(AXIS2_INTF_TO_IMPL(wsdl_svc)->qname, env);
AXIS2_INTF_TO_IMPL(wsdl_svc)->qname = NULL;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Mon Sep 18 18:39:03 2006
@@ -181,7 +181,7 @@
if (ret_name < 0) return 0;
- if (ns != NULL)
+ if (ns)
{
ns_str = AXIS2_QNAME_GET_URI(qname, env);
ret_ns = AXIS2_STRCMP(ns_str, ns) ;
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/buffer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/buffer.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/buffer.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/buffer.c Mon Sep 18 18:39:03 2006
@@ -231,7 +231,7 @@
/*If the size to be removed is less than the buffer size*/
if (size < buffer_impl->size)
{
- if (buffer_impl->data != NULL)
+ if (buffer_impl->data)
{
oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"oxs_buffer_remove_head failed");
@@ -248,7 +248,7 @@
/*If the buffer size is less than the max_size.*/
if (buffer_impl->size < buffer_impl->max_size)
{
- if (buffer_impl->data != NULL)
+ if (buffer_impl->data)
{
oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"oxs_buffer_remove_head failed");
@@ -282,7 +282,7 @@
}
if (buffer_impl->size < buffer_impl->max_size)
{
- if (buffer_impl->data != NULL)
+ if (buffer_impl->data)
{
oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
"");
@@ -503,7 +503,7 @@
}
/*If there are data already then use realloc instead of malloc*/
- if (buffer_impl->data != NULL)
+ if (buffer_impl->data)
{
new_data = (unsigned char*)AXIS2_REALLOC(env->allocator, buffer_impl->data, new_size);
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c Mon Sep 18 18:39:03 2006
@@ -836,14 +836,14 @@
cur = AXIOM_NODE_GET_FIRST_CHILD(node, env);
/* first node is optional EncryptionMethod, we'll read it later */
- if ((cur != NULL) && (oxs_axiom_check_node_name(env, cur, OXS_NodeEncryptionMethod, OXS_EncNs)))
+ if ((cur) && (oxs_axiom_check_node_name(env, cur, OXS_NodeEncryptionMethod, OXS_EncNs)))
{
OXS_CTX_SET_ENC_METHOD_NODE(enc_ctx, env, cur);
cur = AXIOM_NODE_GET_NEXT_SIBLING(cur, env);
}
/* next node is optional KeyInfo, we'll process it later */
- if ((cur != NULL) && (oxs_axiom_check_node_name(env, cur, OXS_NodeKeyInfo, OXS_DSigNs)))
+ if ((cur) && (oxs_axiom_check_node_name(env, cur, OXS_NodeKeyInfo, OXS_DSigNs)))
{
OXS_CTX_SET_KEY_INFO_NODE(enc_ctx, env, cur);
cur = AXIOM_NODE_GET_NEXT_SIBLING(cur, env);
@@ -863,7 +863,7 @@
/* now read the encryption method node */
- if (OXS_CTX_GET_ENC_METHOD_NODE(enc_ctx, env) != NULL)
+ if (OXS_CTX_GET_ENC_METHOD_NODE(enc_ctx, env))
{
ele = AXIOM_NODE_GET_DATA_ELEMENT(OXS_CTX_GET_ENC_METHOD_NODE(enc_ctx, env), env);
OXS_CTX_SET_ENC_MTD_ALGORITHM(enc_ctx, env, AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(ele, env, OXS_AttrAlgorithm));
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/error.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/error.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/error.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/error.c Mon Sep 18 18:39:03 2006
@@ -42,7 +42,7 @@
const char* error_msg = NULL;
unsigned int i;
- for (i = 0; (i < OXS_ERRORS_MAX_NUMBER) && (oxs_errors_get_msg(i) != NULL); ++i)
+ for (i = 0; (i < OXS_ERRORS_MAX_NUMBER) && (oxs_errors_get_msg(i)); ++i)
{
if (oxs_errors_get_code(i) == code)
{
Modified: webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Mon Sep 18 18:39:03 2006
@@ -144,13 +144,13 @@
RAMPART_SECURITY_TIMESTAMP,
wsu_ns_obj,
&ts_node);
- if (NULL != ts_ele)
+ if (ts_ele)
{
/*First we build Created element*/
created_ele = axiom_element_create(env, ts_node, RAMPART_SECURITY_TIMESTAMP_CREATED, wsu_ns_obj,
&created_node);
- if (NULL != created_ele)
+ if (created_ele)
{
created_val = rampart_generate_time(env, 0); /*Current time*/
AXIOM_ELEMENT_SET_TEXT(created_ele, env, created_val, created_node);
@@ -159,7 +159,7 @@
expires_ele = axiom_element_create(env, ts_node, RAMPART_SECURITY_TIMESTAMP_EXPIRES, wsu_ns_obj,
&expires_node);
- if (NULL != expires_ele)
+ if (expires_ele)
{
expires_val = rampart_generate_time(env, ttl);
AXIOM_ELEMENT_SET_TEXT(expires_ele, env, expires_val, expires_node);
Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Mon Sep 18 18:39:03 2006
@@ -259,12 +259,12 @@
AXIOM_ELEMENT_DECLARE_NAMESPACE(ut_ele, env,
ut_node, wsu_ns_obj);
- if (NULL != ut_ele)
+ if (ut_ele)
{
un_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_USERNAME, sec_ns_obj,
&un_node);
- if (NULL != un_ele)
+ if (un_ele)
{
axiom_namespace_t *dec_ns = NULL;
AXIOM_ELEMENT_SET_TEXT(un_ele, env, username, un_node);
@@ -286,7 +286,7 @@
pw_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_PASSWORD, sec_ns_obj,
&pw_node);
- if (NULL != pw_ele)
+ if (pw_ele)
{
AXIOM_ELEMENT_SET_TEXT(pw_ele, env, digest_val, pw_node);
@@ -306,7 +306,7 @@
}
nonce_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_NONCE, sec_ns_obj,
&nonce_node);
- if (NULL != nonce_ele)
+ if (nonce_ele)
{
axiom_namespace_t *dec_ns = NULL;
AXIOM_ELEMENT_SET_TEXT(nonce_ele, env, nonce_val , nonce_node);
@@ -316,7 +316,7 @@
}
created_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_CREATED, sec_ns_obj,
&created_node);
- if (NULL != created_ele)
+ if (created_ele)
{
axiom_namespace_t *dec_ns = NULL;
AXIOM_ELEMENT_SET_TEXT(created_ele, env, created_val, created_node);
@@ -333,7 +333,7 @@
{
pw_ele = axiom_element_create(env, ut_node, RAMPART_SECURITY_USERNAMETOKEN_PASSWORD, sec_ns_obj,
&pw_node);
- if (NULL != pw_ele)
+ if (pw_ele)
{
axiom_namespace_t *dec_ns = NULL;
AXIOM_ELEMENT_SET_TEXT(pw_ele, env, password, pw_node);
Modified: webservices/axis2/trunk/c/samples/client/math/math_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/math_client.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/math_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/math/math_client.c Mon Sep 18 18:39:03 2006
@@ -98,12 +98,12 @@
AXIOM_NODE_SERIALIZE(ret_node, env, om_output);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, env);
printf("\nReceived invalid OM as result : %s\n", buffer);
- if (NULL != buffer)
+ if (buffer)
{
AXIS2_FREE(env->allocator, buffer);
buffer = NULL;
}
- if (NULL != om_output)
+ if (om_output)
{
AXIOM_OUTPUT_FREE(om_output, env);
om_output = NULL;
@@ -159,12 +159,12 @@
AXIOM_NODE_SERIALIZE(math_om_node, env, om_output);
buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
- if (NULL != buffer)
+ if (buffer)
{
AXIS2_FREE(env->allocator, buffer);
buffer = NULL;
}
- if (NULL != om_output)
+ if (om_output)
{
AXIOM_OUTPUT_FREE(om_output, env);
om_output = NULL;
Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c Mon Sep 18 18:39:03 2006
@@ -144,7 +144,7 @@
const axis2_env_t *env)
{
*inst = axis2_calc_create(env);
- /*if(NULL != *inst)
+ /*if( *inst)
{
status = *inst->init();
}*/
Modified: webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math_skeleton.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math_skeleton.c Mon Sep 18 18:39:03 2006
@@ -144,7 +144,7 @@
const axis2_env_t *env)
{
*inst = axis2_math_create(env);
- /*if(NULL != *inst)
+ /*if( *inst)
{
status = *inst->init();
}*/
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Mon Sep 18 18:39:03 2006
@@ -72,7 +72,7 @@
axis2_hash_index_t *hi = NULL;
void *service = NULL;
for (hi = axis2_hash_first(svc_map, env);
- NULL != hi; hi = axis2_hash_next(env, hi))
+ hi; hi = axis2_hash_next(env, hi))
{
axis2_hash_t *ops = NULL;
axis2_svc_t *svc = NULL;
@@ -277,7 +277,7 @@
engaged_modules = AXIS2_CONF_GET_ALL_ENGAGED_MODULES(axis_conf, env);
- if (NULL != engaged_modules)
+ if (engaged_modules)
{
int list_size = 0;
int i = 0;
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/schema_compiler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/schema_compiler.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/schema_compiler.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/schema_compiler.c Mon Sep 18 18:39:03 2006
@@ -552,7 +552,7 @@
qname_str = AXIS2_QNAME_TO_STRING(qname, env);
existing = axis2_hash_get(processed_element_map, qname_str, AXIS2_HASH_KEY_STRING);
- if (existing != NULL)
+ if (existing)
{
return AXIS2_SUCCESS;
}
@@ -562,11 +562,11 @@
is_array = w2c_schema_compiler_is_array(compiler_impl, env, particle);
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(element, env);
- if (schema_type != NULL)
+ if (schema_type)
{
type_name = XML_SCHEMA_TYPE_GET_NAME(schema_type, env);
}
- if (type_name != NULL)
+ if (type_name)
{
type_qname = XML_SCHEMA_TYPE_GET_QNAME(schema_type, env);
class_name = w2c_schema_compiler_find_class_name(compiler_impl, env, qname, is_array);
@@ -585,7 +585,7 @@
{
element_type_qname =
XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME(element, env);
- if (element_type_qname != NULL)
+ if (element_type_qname)
{
class_name = w2c_schema_compiler_find_class_name(compiler_impl, env,
element_type_qname, is_array);
@@ -595,7 +595,7 @@
}
else /* unnamed types would be handled here */
{
- if (schema_type != NULL)
+ if (schema_type)
{
/* TODO: recheck getting the meta inf corrosponding to the element */
meta_inf = axis2_hash_get(compiler_impl-> processed_anonymous_complex_typemap,
@@ -739,7 +739,7 @@
schema_type = XML_SCHEMA_GET_SCHEMA_TYPE(ele, env);
ref_qname = XML_SCHEMA_ELEMENT_GET_REF_NAME(ele, env);
schema_type_qname = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME(ele, env);
- if (schema_type != NULL)
+ if (schema_type)
{
w2c_schema_compiler_process_schema(compiler_impl, env, schema_type, ele, parent_schema);
/** currently we put every thing to an arraylist and later they will be iterated to write */
@@ -748,7 +748,7 @@
{
type_qname = XML_SCHEMA_TYPE_GET_QNAME(schema_type, env);
type_name = XML_SCHEMA_TYPE_GET_NAME(schema_type, env);
- if (type_name != NULL)
+ if (type_name)
{
qname_str = AXIS2_QNAME_TO_STRING(type_qname, env);
class_name = w2c_schema_compiler_find_class_name(compiler_impl, env, type_qname, is_array);
@@ -790,7 +790,7 @@
axis2_hash_set(compiler_impl-> processed_ele_list, qname_str, AXIS2_HASH_KEY_STRING, 1);
}
}
- else if (ref_qname != NULL)
+ else if (ref_qname)
{
current_parent_schema = w2c_schema_compiler_resolve_parent_schema(compiler_impl, env, ref_qname, parent_schema);
ref_ele = XML_SCHEMA_GET_ELEMENT_BY_QNAME(current_parent_schema, env, ref_qname);
@@ -800,7 +800,7 @@
ref_ele_qname = XML_SCHEMA_ELEMENT_GET_QNAME(ref_ele, env);
type_qname = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE_QNAME(ref_ele, env);
type_name = AXIS2_QNAME_GET_LOCALPART(type_qname, env);
- if (NULL != type_name)
+ if (type_name)
{
class_name = w2c_schema_compiler_find_class_name(compiler_impl, env, type_qname, is_array);
qname_str = AXIS2_QNAME_TO_STRING(ref_ele_qname, env);
@@ -837,11 +837,11 @@
}
}
}
- else if (schema_type_qname != NULL)
+ else if (schema_type_qname)
{
current_parent_schema = w2c_schema_compiler_resolve_parent_schema(compiler_impl, env, schema_type_qname, parent_schema);
type_by_name = XML_SCHEMA_GET_TYPE_BY_QNAME(current_parent_schema, env, schema_type_qname);
- if (NULL != type_by_name)
+ if (type_by_name)
{
/*this type is found in the schema so we can process it*/
w2c_schema_compiler_process_schema(ele, type_by_name, current_parent_schema);
@@ -959,13 +959,13 @@
target_ns = AXIS2_QNAME_GET_URI(schema_type_qname, env);
loaded_schema = (xml_schema_t*)axis2_hash_get(compiler_impl-> loaded_schema_map,
target_ns, AXIS2_HASH_KEY_STRING);
- if (loaded_schema != NULL)
+ if (loaded_schema)
{
return loaded_schema;
}
schema = (xml_schema_t*)axis2_hash_get(compiler_impl-> available_schema_map,
target_ns, AXIS2_HASH_KEY_STRING);
- if (schema != NULL)
+ if (schema)
{
w2c_schema_compiler_compile_inner(compiler, env, schema, AXIS2_FALSE);
return schema;
@@ -1051,7 +1051,7 @@
{
base_hash = XML_SCHEMA_TYPE_SUPER_OBJS(schema_type, env);
complex_type = axis2_hash_get(base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
- if (XML_SCHEMA_TYPE_GET_NAME(schema_type, env) != NULL)
+ if (XML_SCHEMA_TYPE_GET_NAME(schema_type, env))
{
w2c_schema_compiler_process_named_complex_schema_type(
compler_impl, env, complex_type, parent_schema);
@@ -1182,7 +1182,7 @@
particle = XML_SCHEMA_COMPLEX_TYPE_GET_PARTICLE(complex_type, env);
meta_info = w2c_schema_writer_meta_info_create(env);
- if (particle != NULL)
+ if (particle)
{
w2_schema_compiler_process_particle(particle, meta_info, parent_schema);
}
@@ -1203,7 +1203,7 @@
/* process any attribute */
/* java note:somehow the xml schema parser does not seem to pickup the any attribute! */
any_attri = XML_SCHEMA_COMPLEX_TYPE_GET_ANY_ATTRIBUTE(complex_type, env);
- if (any_attri != NULL)
+ if (any_attri)
{
w2c_schema_compiler_process_any_attribute(compiler_impl, env, any_attri, meta_info);
}
@@ -1272,14 +1272,14 @@
if (!w2c_schema_compiler_is_already_processed(compiler_impl, env, base_type_qname))
{
type = XML_SCHEMA_GET_TYPE_BY_QNAME(parent_schema, env, base_type_qname);
- if (NULL != type)
+ if (type)
{
if (XML_SCHEMA_COMPLEX_TYPE = XML_SCHEMA_TYPE_GET_TYPE(type, env))
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS(type, env);
complex_type = axis2_hash_get(base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME(type, env);
- if (NULL != name)
+ if (name)
{
w2c_schema_compiler_processed_named_complex_schema_type(compiler_impl,
env, complex_type, parent_schema);
@@ -1324,14 +1324,14 @@
if (!w2c_schema_compiler_is_already_processed(compiler_impl, env, base_type_qname))
{
type = XML_SCHEMA_GET_TYPE_BY_QNAME(parent_schema, env, base_type_qname);
- if (NULL != type)
+ if (type)
{
if (XML_SCHEMA_COMPLEX_TYPE = XML_SCHEMA_TYPE_GET_TYPE(type, env))
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS(type, env);
complex_type = axis2_hash_get(base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME(type, env);
- if (NULL != name)
+ if (name)
{
w2c_schema_compiler_processed_named_complex_schema_type(compiler_impl,
env, complex_type, parent_schema);
@@ -1392,7 +1392,7 @@
meta_info = axis2_hash_get(compiler-> processed_type_meta_info_map, qname_str,
AXIS2_HASH_KEY_STRING);
- if (meta_info != NULL)
+ if (meta_info)
{
if (XML_SCHEMA_COMPLEX_TYPE = XML_SCHEMA_TYPE_GET_TYPE(type, env))
{
@@ -1483,14 +1483,14 @@
if (!w2c_schema_compiler_is_already_processed(compiler_impl, env, base_type_qname))
{
type = XML_SCHEMA_GET_TYPE_BY_QNAME(parent_schema, env, base_type_qname);
- if (NULL != type)
+ if (type)
{
if (XML_SCHEMA_COMPLEX_TYPE = XML_SCHEMA_TYPE_GET_TYPE(type, env))
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS(type, env);
complex_type = axis2_hash_get(base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME(type, env);
- if (NULL != name)
+ if (name)
{
w2c_schema_compiler_processed_named_complex_schema_type(compiler_impl,
env, complex_type, parent_schema);
@@ -1529,7 +1529,7 @@
/* process any attribute */
any_attri = XML_SCHEMA_COMPLEX_CONTENT_EXTENSION_GET_ANY_ATTRIBUTE(extension, env);
- if (any_attri != NULL)
+ if (any_attri)
{
w2c_schema_compiler_process_any_attribute(compiler_impl, env, any_attri, meta_info);
}
@@ -1543,14 +1543,14 @@
if (!w2c_schema_compiler_is_already_processed(compiler_impl, env, base_type_qname))
{
type = XML_SCHEMA_GET_TYPE_BY_QNAME(parent_schema, env, base_type_qname);
- if (NULL != type)
+ if (type)
{
if (XML_SCHEMA_COMPLEX_TYPE = XML_SCHEMA_TYPE_GET_TYPE(type, env))
{
base_hash = XML_SCHEMA_COMPLEX_TYPE_SUPER_OBJS(type, env);
complex_type = axis2_hash_get(base_hash, "XML_SCHEMA_COMPLEX_TYPE", AXIS2_HASH_KEY_STRING);
name = XML_SCHEMA_TYPE_GET_NAME(type, env);
- if (NULL != name)
+ if (name)
{
w2c_schema_compiler_processed_named_complex_schema_type(compiler_impl,
env, complex_type, parent_schema);
@@ -1772,7 +1772,7 @@
mapped_qname = axis2_hash_get(compiler_impl-> base_schema_type_map, qname_str,
AXIS2_HASH_KEY_STRING);
/* for now we assume (!!!) that attributes refer to standard types only */
- if (mapped_qname != NULL)
+ if (mapped_qname)
{
attr_qname = XML_SCHEMA_ATTRIBUTE_GET_QNAME(attri, env);
qname_str = AXIS2_QNAME_TO_STRING(mapped_qname, env);
@@ -1914,14 +1914,14 @@
{
ele = (xml_schema_element_t*) key;
qname = XML_SCHEMA_ELEMENT_GET_QNAME(ele, env);
- if (qname != NULL)
+ if (qname)
{
qname_str = AXIS2_QNAME_TO_STRING(qname, env);
class_name = (axis2_char_t*)axis2_hash_get(compiler_impl-> processed_element_type_map,
qname_str, AXIS2_HASH_KEY_STRING);
/* always get the schema type name from the schema it-self */
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(ele, env);
- if (schema_type != NULL)
+ if (schema_type)
{
schema_type_qname = XML_SCHEMA_TYPE_GET_QNAME(schema_type, env);
}
@@ -1969,7 +1969,7 @@
index + starting_item_number_order);
}
/* get the nillable state and register that on the metainf holder */
- if (axis2_hash_get(local_nillable_list, qname_str, AXIS2_HASH_KEY_STRING) != NULL)
+ if (axis2_hash_get(local_nillable_list, qname_str, AXIS2_HASH_KEY_STRING))
{
W2C_SCHEMA_WRITER_META_INFO_REGISTER_NILLABLE_QNAME(meta_info, env, qname);
}
@@ -2034,7 +2034,7 @@
axis2_char_t *qname_str = NULL;
schema_type = XML_SCHEMA_ELEMENT_GET_SCHEMA_TYPE(ele, env);
- if (schema_type != NULL)
+ if (schema_type)
{
qname = XML_SCHEMA_TYPE_GET_QNAME(schema_type, env);
qname_str = AXIS2_QNAME_TO_STRING(qname, env);
@@ -2074,7 +2074,7 @@
qname_str = AXIS2_QNAME_TO_STRING(base_type_qname, env);
class_name = axis2_hash_get(compiler_impl-> base_schema_type_map, qname_str, AXIS2_HASH_KEY_STRING);
- if (class_name != NULL)
+ if (class_name)
{
type_qname = xml_schema_simple_type_get_qname(simple_type, env);
qname_str = AXIS2_QNAME_TO_STRING(type_qname, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/schema_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/schema_property_loader.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/schema_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/schema_property_loader.c Mon Sep 18 18:39:03 2006
@@ -170,7 +170,7 @@
schema_property_loader_impl-> prop_set = axis2_properties_create(env);
AXIS2_PROPERTIES_LOAD(schema_property_loader_impl-> prop_set, env, f);
- if (schema_property_loader_impl-> prop_set != NULL)
+ if (schema_property_loader_impl-> prop_set)
{
w2c_schema_property_loader_load_values(schema_property_loader_impl, env);
}
@@ -310,7 +310,7 @@
schema_property_loader_impl-> prop_set = axis2_properties_create(env);
AXIS2_PROPERTIES_LOAD(schema_property_loader_impl-> prop_set, env, f);
- if (schema_property_loader_impl-> prop_set != NULL)
+ if (schema_property_loader_impl-> prop_set)
{
w2c_schema_property_loader_load_values(schema_property_loader_impl, env);
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/schema_writer_meta_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/schema_writer_meta_info.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/schema_writer_meta_info.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/schema_writer_meta_info.c Mon Sep 18 18:39:03 2006
@@ -1587,7 +1587,7 @@
{
qname = (axis2_qname_t*) AXIS2_ARRAY_LIST_GET(
writer_meta_info_impl-> qname_orderlist, env, i);
- if (qname != NULL)
+ if (qname)
{
AXIS2_ARRAY_LIST_SET(arr_list, env, real_index, qname);
real_index ++;
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c Mon Sep 18 18:39:03 2006
@@ -269,7 +269,7 @@
w2c_xslt_utils_add_child_node(env, "bean", NULL);
w2c_xslt_utils_add_attribute(env, writer_impl-> global_wrapped_source_node,
"name", W2C_SCHEMA_WRITER_WRAPPED_DATABINDING_CLASS_NAME);
- if (writer_impl-> package_name != NULL)
+ if (writer_impl-> package_name)
{
length = AXIS2_STRLEN(writer_impl-> package_name);
if (writer_impl-> package_name[length-1] == '.')
@@ -289,7 +289,7 @@
w2c_xslt_utils_add_child_node(env, "bean", NULL);
w2c_xslt_utils_add_attribute(env, writer_impl-> global_wrapped_header_node,
"name", W2C_SCHEMA_WRITER_WRAPPED_DATABINDING_CLASS_NAME);
- if (writer_impl-> package_name != NULL)
+ if (writer_impl-> package_name)
{
length = AXIS2_STRLEN(writer_impl-> package_name);
if (writer_impl-> package_name[length-1] == '.')
@@ -309,7 +309,7 @@
W2C_SCHEMA_COMPILER_OPTIONS_GET_NS2PACKAGE_MAP(options, env);
writer_impl-> is_helper_mode =
W2C_SCHEMA_COMPILER_OPTIONS_GET_HELPER_MODE(options, env);
- if (W2C_SCHEMA_COMPILER_OPTIONS_GET_MAPPER_CLASS_PACKAGE(options, env) != NULL)
+ if (W2C_SCHEMA_COMPILER_OPTIONS_GET_MAPPER_CLASS_PACKAGE(options, env))
{
writer_impl-> mapping_class_package =
W2C_SCHEMA_COMPILER_OPTIONS_GET_MAPPER_CLASS_PACKAGE(options, env);
@@ -446,7 +446,7 @@
{
package_prefix = package_name;
}
- if (package_prefix != NULL)
+ if (package_prefix)
{
length = AXIS2_STRLEN(fully_qualifed_class_name);
fully_qualifed_class_name = axis2_stracat(package_prefix,
@@ -626,7 +626,7 @@
{
w2c_schema_writer_meta_info_t *parent_meta_info = NULL;
parent_meta_info = W2C_SCHEMA_WRITER_META_INFO_GET_PARENT(meta_info, env);
- if (parent_meta_info != NULL)
+ if (parent_meta_info)
{
/* recursively do for all the parents */
w2c_schema_writer_populate_info(writer_impl, env,
@@ -711,7 +711,7 @@
qname_str = AXIS2_QNAME_TO_STRING(schema_qname, env);
schema_type = axis2_hash_get(writer_impl-> typemap, qname_str, AXIS2_HASH_KEY_STRING);
- if (schema_type != NULL)
+ if (schema_type)
{
w2c_xslt_utils_add_attribute(env, property, "ours", "yes");
}
@@ -724,7 +724,7 @@
w2c_xslt_utils_add_attribute(env, property, "nillable", "yes");
}
schema_type = axis2_hash_get(writer_impl-> base_typemap, qname_str, AXIS2_HASH_KEY_STRING);
- if (schema_qname != NULL && schema_type != NULL)
+ if (schema_qname && schema_type != NULL)
{
short_type_name = AXIS2_QNAME_GET_LOCALPART(schema_qname, env);
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c Mon Sep 18 18:39:03 2006
@@ -241,7 +241,7 @@
config_property_loader_impl-> prop_set = w2c_properties_create(env,
config_property_loader_impl-> prop_filename ,
W2C_CONFIG_PROPERTY_LOADER_SEPARATOR_CHAR);
- if (config_property_loader_impl-> prop_set != NULL)
+ if (config_property_loader_impl-> prop_set)
{
w2c_config_property_loader_load_values(config_property_loader_impl, env);
}
@@ -423,7 +423,7 @@
config_property_loader_impl-> prop_set = w2c_properties_create(env,
config_property_loader_impl-> prop_filename ,
W2C_CONFIG_PROPERTY_LOADER_SEPARATOR_CHAR);
- if (config_property_loader_impl-> prop_set != NULL)
+ if (config_property_loader_impl-> prop_set)
{
w2c_config_property_loader_load_values(config_property_loader_impl, env);
}
@@ -642,7 +642,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_CODE_GEN_KEY_PREFIX,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->extension_class_names =
w2c_config_property_loader_dup_array(prop, env);
@@ -652,7 +652,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_POST_CODE_GEN_KEY_PREFIX,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->post_extension_class_names =
w2c_config_property_loader_dup_array(prop, env);
@@ -662,7 +662,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_NAME_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->databinding_framework_names =
w2c_config_property_loader_dup_array(prop, env);
@@ -673,7 +673,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_EXTENSION_NAME_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
temp_array =
w2c_config_property_loader_dup_array(prop, env);
@@ -702,7 +702,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_FRAMEWORK_DEFAULT_NAME_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->default_db_framework_name =
AXIS2_STRDUP(AXIS2_ARRAY_LIST_GET(prop, env, 0), env);
@@ -712,7 +712,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_THIRD_PARTY_SCHEMA_KEY_PREFIX,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->third_party_schema_names =
AXIS2_STRDUP(AXIS2_ARRAY_LIST_GET(prop, env, 0), env);
@@ -722,7 +722,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEMPLATE_NAME_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->db_supporter_template_name =
AXIS2_STRDUP(AXIS2_ARRAY_LIST_GET(prop, env, 0), env);
@@ -736,7 +736,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DATA_BINDING_TEST_OBJECT_TEMPLATE_NAME_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->test_object_template_name =
AXIS2_STRDUP(AXIS2_ARRAY_LIST_GET(prop, env, 0), env);
@@ -747,7 +747,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_LANGUAGE_TYPE_KEY_PREFIX,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->language_types =
w2c_config_property_loader_dup_array(prop, env);
@@ -757,7 +757,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_EMITTER_CLASS_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
temp_array = w2c_config_property_loader_dup_array(prop, env);
@@ -787,7 +787,7 @@
prop = (axis2_array_list_t*)axis2_hash_get(prop_hash,
W2C_CONFIG_PROPERTY_LOADER_DEFAULT_LANGUAGE_TYPE_KEY,
AXIS2_HASH_KEY_STRING);
- if (prop != NULL)
+ if (prop)
{
obj_impl ->default_language =
AXIS2_STRDUP(AXIS2_ARRAY_LIST_GET(prop, env, 0), env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/cqname2name_maker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/cqname2name_maker.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/cqname2name_maker.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/cqname2name_maker.c Mon Sep 18 18:39:03 2006
@@ -153,7 +153,7 @@
key = AXIS2_QNAME_TO_STRING(qname, env);
local = (axis2_char_t*)axis2_hash_get(cqname2name_maker_impl-> qname2name, key,
AXIS2_HASH_KEY_STRING);
- if (local != NULL) /* key has been there somewhere */
+ if (local) /* key has been there somewhere */
{
return local;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/properties.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/properties.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/properties.c Mon Sep 18 18:39:03 2006
@@ -183,7 +183,7 @@
for (i = 0; i < size; i ++)
{
value = (axis2_char_t*)AXIS2_ARRAY_LIST_GET(values_arr, env, i);
- if (value != NULL)
+ if (value)
{
AXIS2_FREE(env-> allocator, value);
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Mon Sep 18 18:39:03 2006
@@ -185,12 +185,12 @@
typemapper_impl-> mapper_name =
AXIS2_STRDUP(typemapper_impl-> mapper_name, env);
it = AXIOM_ELEMENT_GET_CHILDREN(root_ele, env, root);
- while ((child = AXIOM_CHILDREN_ITERATOR_NEXT(it, env)) != NULL)
+ while ((child = AXIOM_CHILDREN_ITERATOR_NEXT(it, env)))
{
child_ele = AXIOM_NODE_GET_DATA_ELEMENT(child, env);
is_default = AXIS2_FALSE;
if ((attri_val = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME
- (child_ele, env, "default")) != NULL)
+ (child_ele, env, "default")))
{
is_default = AXIS2_TRUE;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c Mon Sep 18 18:39:03 2006
@@ -116,7 +116,7 @@
}
free(long_path);
- if (NULL != path)
+ if (path)
path_length = strlen(path);
if (0 != path_length)
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c Mon Sep 18 18:39:03 2006
@@ -110,7 +110,7 @@
it = AXIOM_ELEMENT_GET_CHILDREN(from_ele, env, from);
AXIOM_CHILDREN_ITERATOR_RESET(it, env);
- while ((from_child = AXIOM_CHILDREN_ITERATOR_NEXT(it, env)) != NULL)
+ while ((from_child = AXIOM_CHILDREN_ITERATOR_NEXT(it, env)))
{
if (AXIOM_NODE_GET_NODE_TYPE(from_child, env) == AXIOM_TEXT)
{
@@ -130,13 +130,13 @@
}
attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(from_ele, env);
- if (NULL != attr_ht)
+ if (attr_ht)
{
for (hi = axis2_hash_first(attr_ht, env); hi;
hi = axis2_hash_next(env, hi))
{
axis2_hash_this(hi, NULL, NULL, &val);
- if (NULL != val)
+ if (val)
{
om_attri = (axiom_attribute_t *)val;
om_attri = AXIOM_ATTRIBUTE_CLONE(om_attri, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Mon Sep 18 18:39:03 2006
@@ -212,7 +212,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
engine_impl = W2C_INTF_TO_IMPL(engine);
- if (engine_impl-> pre_extensions != NULL)
+ if (engine_impl-> pre_extensions)
{
size = AXIS2_ARRAY_LIST_SIZE(engine_impl-> pre_extensions, env);
for (i = 0; i < size ; i++)
@@ -266,7 +266,7 @@
w2c_class_loader_free_loaded_class(env, dll_desc);
- if (engine_impl-> post_extensions != NULL)
+ if (engine_impl-> post_extensions)
{
size = AXIS2_ARRAY_LIST_SIZE(engine_impl-> post_extensions, env);
for (i = 0; i < size ; i++)
@@ -277,7 +277,7 @@
}
}
/** freeing used extension right here */
- if (engine_impl-> pre_extensions != NULL)
+ if (engine_impl-> pre_extensions)
{
size = AXIS2_ARRAY_LIST_SIZE(engine_impl-> pre_extensions, env);
for (i = 0; i < size ; i++)
@@ -287,7 +287,7 @@
/*w2c_class_loader_free_loaded_class(env, dll_desc);*/
}
- if (engine_impl-> post_extensions != NULL)
+ if (engine_impl-> post_extensions)
{
size = AXIS2_ARRAY_LIST_SIZE(engine_impl-> post_extensions, env);
for (i = 0; i < size ; i++)
@@ -318,7 +318,7 @@
prop_loader = engine_impl-> prop_loader;
extension_names =
W2C_CONFIG_PROPERTY_LOADER_GET_EXTENSION_CLASS_NAMES(prop_loader, env);
- if (extension_names != NULL)
+ if (extension_names)
{
engine_impl-> pre_extensions
= axis2_array_list_create(env, 10);
@@ -331,7 +331,7 @@
(extension_names, env , i);
ext = w2c_class_loader_get_object_from_class_name
(env, class_name, W2C_CLASS_LOADER_EXTENSION_PATH, &dll_desc);
- if (NULL != ext)
+ if (ext)
{
AXIS2_ARRAY_LIST_ADD_AT(engine_impl-> pre_extensions,
env, i, (void*)ext);
@@ -348,7 +348,7 @@
extension_names =
W2C_CONFIG_PROPERTY_LOADER_GET_POST_EXTENSION_CLASS_NAMES(prop_loader, env);
- if (extension_names != NULL)
+ if (extension_names)
{
engine_impl-> post_extensions
= axis2_array_list_create(env, 10);
@@ -361,7 +361,7 @@
(extension_names, env , i);
ext = w2c_class_loader_get_object_from_class_name
(env, class_name, W2C_CLASS_LOADER_EXTENSION_PATH, &dll_desc);
- if (NULL != ext)
+ if (ext)
{
AXIS2_ARRAY_LIST_ADD_AT(engine_impl-> post_extensions,
env, i, ext);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c Mon Sep 18 18:39:03 2006
@@ -60,7 +60,7 @@
W2C_CMDLINE_OPTION_CONSTS_LONG_OUTPUT_LOCATION,
option_map);
- if (option != NULL)
+ if (option)
{
tmp_string = W2C_CMDLINE_OPTION_GET_VALUE(option , env);
}
@@ -76,14 +76,14 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_SERVER_SIDE_CODE,
W2C_CMDLINE_OPTION_CONSTS_LONG_SERVER_SIDE_CODE,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_SERVER_SIDE(conf, env, tmp_bool);
/* set service description*/
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_SERVICE_DESCRIPTION,
W2C_CMDLINE_OPTION_CONSTS_LONG_SERVICE_DESCRIPTION,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_GENERATE_DEPLOYEMENT_DESCRIPTOR
(conf, env, tmp_bool);
@@ -95,14 +95,14 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_ASYNC_ONLY,
W2C_CMDLINE_OPTION_CONSTS_LONG_ASYNC_ONLY,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_SYNC_ON(conf, env, !tmp_bool);
/* set sync only flag - this would have the priority*/
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_SYNC_ONLY,
W2C_CMDLINE_OPTION_CONSTS_LONG_SYNC_ONLY,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_ASYNC_ON(conf, env, !tmp_bool);
/* package option */
@@ -144,7 +144,7 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_UNPACK_CLASSES,
W2C_CMDLINE_OPTION_CONSTS_LONG_UNPACK_CLASSES,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_PACK_CLASSES(conf, env, !tmp_bool);
/* port name option */
@@ -184,7 +184,7 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_SERVER_SIDE_CODE,
W2C_CMDLINE_OPTION_CONSTS_LONG_SERVER_SIDE_CODE,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_SERVERSIDE_INTERFACE
(conf, env, tmp_bool);
@@ -192,7 +192,7 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_GENERATE_ALL,
W2C_CMDLINE_OPTION_CONSTS_LONG_GENERATE_ALL,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_GENERATE_ALL
(conf, env, tmp_bool);
@@ -200,7 +200,7 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_CONVERT_NAMES,
W2C_CMDLINE_OPTION_CONSTS_LONG_CONVERT_NAMES,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_CONVERT_NAMES
(conf, env, tmp_bool);
@@ -208,7 +208,7 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_INDENT_CODE,
W2C_CMDLINE_OPTION_CONSTS_LONG_INDENT_CODE,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_INDENT_CODE
(conf, env, tmp_bool);
@@ -254,7 +254,7 @@
tmp_bool = w2c_engine_config_loader_load_option(env,
W2C_CMDLINE_OPTION_CONSTS_FLATTEN_FILES,
W2C_CMDLINE_OPTION_CONSTS_LONG_FLATTEN_FILES,
- option_map) != NULL;
+ option_map) ;
W2C_ENGINE_CONFIGURATION_SET_FLATTEN_FILES(conf, env, tmp_bool);
@@ -383,17 +383,17 @@
axis2_hash_t *options_map)
{
w2c_cmdline_option_t *option = NULL;
- if (long_opt != NULL)
+ if (long_opt)
{
option = (w2c_cmdline_option_t*)axis2_hash_get(options_map,
long_opt, AXIS2_HASH_KEY_STRING);
- if (option != NULL)
+ if (option)
{
return option;
}
}
/* short option gets last precedence */
- if (short_opt != NULL)
+ if (short_opt)
{
option = (w2c_cmdline_option_t*)axis2_hash_get(options_map,
short_opt, AXIS2_HASH_KEY_STRING);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c Mon Sep 18 18:39:03 2006
@@ -130,7 +130,7 @@
key = AXIS2_QNAME_TO_STRING(qname, env);
local = (axis2_char_t*)axis2_hash_get(impl-> qname2name, key,
AXIS2_HASH_KEY_STRING);
- if (local != NULL) /* key has been there somewhere */
+ if (local) /* key has been there somewhere */
{
return local;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c Mon Sep 18 18:39:03 2006
@@ -69,7 +69,7 @@
if (NULL == db_type || !AXIS2_STRCMP(db_type, "none"))
{
typemapper = W2C_ENGINE_CONFIGURATION_GET_TYPEMAPPER(conf, env);
- if (typemapper != NULL)
+ if (typemapper)
{
W2C_TYPEMAPPER_FREE(typemapper, env);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org