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 [2/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/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Mon Sep 18 18:39:03 2006
@@ -207,7 +207,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
fault_text_impl = AXIS2_INTF_TO_IMPL(fault_text);
- if (NULL != fault_text->ops)
+ if (fault_text->ops)
{
AXIS2_FREE(env->allocator, fault_text->ops);
fault_text->ops = NULL;
@@ -235,11 +235,11 @@
AXIS2_PARAM_CHECK(env->error, lang, AXIS2_FAILURE);
fault_text_impl = AXIS2_INTF_TO_IMPL(fault_text);
- if (NULL != fault_text_impl->lang_attribute)
+ if (fault_text_impl->lang_attribute)
{
axis2_char_t *attr_lang = NULL;
attr_lang = AXIOM_ATTRIBUTE_GET_VALUE(fault_text_impl->lang_attribute, env);
- if (NULL != attr_lang)
+ if (attr_lang)
{
if (AXIS2_STRCMP(attr_lang, lang) == 0)
{
@@ -361,15 +361,15 @@
text_impl = AXIS2_INTF_TO_IMPL(fault_text);
- if (NULL != text_impl->om_ele_node)
+ if (text_impl->om_ele_node)
{
axiom_element_t *text_ele = NULL;
text_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(text_impl->om_ele_node, env);
- if (NULL != text_ele)
+ if (text_ele)
{
AXIOM_ELEMENT_SET_TEXT(text_ele, env, value, text_impl->om_ele_node);
- if (NULL != lang)
+ if (lang)
{
axiom_soap_fault_text_set_lang(fault_text, env, lang);
}
@@ -389,12 +389,12 @@
text_impl = AXIS2_INTF_TO_IMPL(fault_text);
- if (NULL != text_impl->om_ele_node)
+ if (text_impl->om_ele_node)
{
axiom_element_t *text_ele = NULL;
text_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(text_impl->om_ele_node, env);
- if (NULL != text_ele)
+ if (text_ele)
{
text = AXIOM_ELEMENT_GET_TEXT(text_ele, env,
text_impl->om_ele_node);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_value.c Mon Sep 18 18:39:03 2006
@@ -235,7 +235,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != fault_value->ops)
+ if (fault_value->ops)
{
AXIS2_FREE(env->allocator, fault_value->ops);
fault_value->ops = NULL;
@@ -305,7 +305,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, text, AXIS2_FAILURE);
fault_value_impl = AXIS2_INTF_TO_IMPL(fault_value);
- if (NULL != fault_value_impl->om_ele_node &&
+ if (fault_value_impl->om_ele_node &&
AXIOM_NODE_GET_NODE_TYPE(fault_value_impl->om_ele_node, env) == AXIOM_ELEMENT)
{
axiom_element_t *om_ele = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Mon Sep 18 18:39:03 2006
@@ -215,7 +215,7 @@
AXIOM_SOAP_HEADER_FREE(header, env);
return NULL;
}
- if (NULL != AXIOM_NODE_GET_FIRST_CHILD(parent_node, env))
+ if (AXIOM_NODE_GET_FIRST_CHILD(parent_node, env))
{
body_node = AXIOM_NODE_GET_FIRST_CHILD(parent_node, env);
AXIOM_NODE_DETACH(body_node, env);
@@ -233,7 +233,7 @@
header_impl->om_ele_node = this_node;
axiom_soap_envelope_set_header(envelope, env, header);
- if (NULL != body_node)
+ if (body_node)
{
AXIOM_NODE_ADD_CHILD(parent_node, env, body_node);
}
@@ -250,7 +250,7 @@
header_impl = AXIS2_INTF_TO_IMPL(header);
- if (NULL != header_impl->header_blocks)
+ if (header_impl->header_blocks)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -268,7 +268,7 @@
axis2_hash_free(header_impl->header_blocks, env);
}
- if (NULL != header_impl->header_block_keys)
+ if (header_impl->header_block_keys)
{
int size = 0;
void *val = NULL;
@@ -277,7 +277,7 @@
for (i = 0; i < size; i++)
{
val = AXIS2_ARRAY_LIST_GET(header_impl->header_block_keys, env, i);
- if (NULL != val)
+ if (val)
{
AXIS2_FREE(env->allocator, (char*)val);
val = NULL;
@@ -286,7 +286,7 @@
AXIS2_ARRAY_LIST_FREE(header_impl->header_block_keys, env);
header_impl->header_block_keys = NULL;
}
- if (NULL != header->ops)
+ if (header->ops)
{
AXIS2_FREE(env->allocator, header->ops);
header->ops = NULL;
@@ -445,7 +445,7 @@
{
first_ele = AXIOM_ELEMENT_GET_FIRST_ELEMENT(header_om_ele, env,
header_impl->om_ele_node, &first_node);
- if (NULL != first_node)
+ if (first_node)
{
return axiom_children_with_specific_attribute_iterator_create(env,
first_node, qn, role, AXIS2_TRUE);
@@ -542,7 +542,7 @@
axis2_hash_set(header_impl->header_blocks,
key , AXIS2_HASH_KEY_STRING, header_block);
}
- if (NULL != header_impl->header_block_keys)
+ if (header_impl->header_block_keys)
{
AXIS2_ARRAY_LIST_ADD(header_impl->header_block_keys, env, key);
}
@@ -613,7 +613,7 @@
{
ns = AXIOM_ELEMENT_GET_NAMESPACE(header_block_om_ele, env,
header_block_om_node);
- if (NULL != ns)
+ if (ns)
{
hb_namespace_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
if (AXIS2_STRCMP(hb_namespace_uri, ns_uri) == 0)
@@ -681,7 +681,7 @@
void *val = NULL;
axis2_hash_this(hi, &key, NULL, &val);
- if (NULL != val)
+ if (val)
{
axiom_soap_header_block_t *header_block = NULL;
axiom_element_t *ele = NULL;
@@ -689,7 +689,7 @@
header_block = (axiom_soap_header_block_t*)val;
node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(header_block, env);
- if (NULL != node)
+ if (node)
{
axis2_qname_t *element_qname = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Mon Sep 18 18:39:03 2006
@@ -466,7 +466,7 @@
}
else
{
- if (NULL != soap_envelope_namespace_uri)
+ if (soap_envelope_namespace_uri)
om_ns = axiom_namespace_create(env,
soap_envelope_namespace_uri,
AXIOM_SOAP_DEFAULT_NAMESPACE_PREFIX);
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Mon Sep 18 18:39:03 2006
@@ -38,7 +38,7 @@
}
child_node = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
- while (NULL != child_node)
+ while (child_node)
{
if (AXIOM_NODE_GET_NODE_TYPE(child_node, env) == AXIOM_ELEMENT)
{
@@ -48,11 +48,11 @@
child_ele = (axiom_element_t*)
AXIOM_NODE_GET_DATA_ELEMENT(child_node, env);
ns = AXIOM_ELEMENT_GET_NAMESPACE(child_ele, env, child_node);
- if (NULL != ns)
+ if (ns)
{
axis2_char_t *child_uri = NULL;
child_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- if (NULL != child_uri && AXIS2_STRCMP(child_uri, uri) == 0)
+ if (child_uri && AXIS2_STRCMP(child_uri, uri) == 0)
{
(*child) = child_node;
return child_ele;
@@ -81,7 +81,7 @@
}
next_sib_node = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
- while (NULL != next_sib_node)
+ while (next_sib_node)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sib_node, env) == AXIOM_ELEMENT)
{
@@ -91,11 +91,11 @@
sib_ele = (axiom_element_t*)
AXIOM_NODE_GET_DATA_ELEMENT(next_sib_node, env);
ns = AXIOM_ELEMENT_GET_NAMESPACE(sib_ele, env, next_sib_node);
- if (NULL != ns)
+ if (ns)
{
axis2_char_t *sib_uri = NULL;
sib_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- if (NULL != sib_uri && AXIS2_STRCMP(sib_uri, uri) == 0)
+ if (sib_uri && AXIS2_STRCMP(sib_uri, uri) == 0)
{
(*next_node) = next_sib_node;
return sib_ele;
@@ -134,7 +134,7 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
last_node = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
- while (NULL != last_node)
+ while (last_node)
{
if (AXIOM_NODE_GET_NODE_TYPE(last_node, env) == AXIOM_ELEMENT)
{
@@ -159,7 +159,7 @@
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
@@ -189,16 +189,16 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
- if (NULL != child)
+ if (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(child, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+ if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
{
*child_node = child;
return om_ele;
@@ -210,15 +210,15 @@
}
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+ if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
{
*child_node = next_sibling;
return om_ele;
@@ -251,16 +251,16 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
- while (NULL != child)
+ while (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname &&
+ if (child_localname &&
AXIS2_STRCMP(child_localname, localname) == 0)
{
*child_node = child;
@@ -291,16 +291,16 @@
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
+ if (ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
{
*next_node = next_sibling;
return om_ele;
@@ -345,15 +345,15 @@
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(child , env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, child);
- if (NULL != ns)
+ if (ns)
ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- if ((NULL != child_localname) &&
- (AXIS2_STRCMP(child_localname, localname) == 0) && (NULL != ns_uri)
+ if ((child_localname) &&
+ (AXIS2_STRCMP(child_localname, localname) == 0) && (ns_uri)
&& (AXIS2_STRCMP(ns_uri, uri) == 0))
{
*child_node = child;
@@ -367,20 +367,20 @@
ns_uri = NULL;
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
- if (NULL != ns)
+ if (ns)
ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- if ((NULL != child_localname) &&
- (AXIS2_STRCMP(child_localname, localname) == 0) && (NULL != ns_uri) &&
+ if ((child_localname) &&
+ (AXIS2_STRCMP(child_localname, localname) == 0) && (ns_uri) &&
(AXIS2_STRCMP(ns_uri, uri) == 0))
{
*child_node = next_sibling;
@@ -418,20 +418,20 @@
AXIS2_PARAM_CHECK(env->error, uri, NULL);
child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
- while (NULL != child)
+ while (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
- if (NULL != om_ele)
+ if (om_ele)
{
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, ele_node);
- if (NULL != ns)
+ if (ns)
ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname &&
- (AXIS2_STRCMP(child_localname, localname) == 0) && (NULL != ns_uri)
+ if (child_localname &&
+ (AXIS2_STRCMP(child_localname, localname) == 0) && (ns_uri)
&& (AXIS2_STRCMP(ns_uri, uri) == 0))
{
*child_node = child;
@@ -465,20 +465,20 @@
AXIS2_PARAM_CHECK(env->error, ele_node, NULL);
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
- if (NULL != ns)
+ if (ns)
ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != ele_localname &&
- (AXIS2_STRCMP(localname, ele_localname) == 0) && (NULL != ns)
+ if (ele_localname &&
+ (AXIS2_STRCMP(localname, ele_localname) == 0) && (ns)
&& (AXIS2_STRCMP(ns_uri, uri) == 0))
{
*next_node = next_sibling;
@@ -515,13 +515,13 @@
AXIS2_PARAM_CHECK(env->error, names, NULL);
child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
- if (NULL != child)
+ if (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(child, env);
- if (NULL != om_ele)
+ if (om_ele)
{
size = AXIS2_ARRAY_LIST_SIZE(names, env);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
@@ -530,7 +530,7 @@
{
given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
- if ((NULL != child_localname) && (NULL != given_localname) &&
+ if ((child_localname) && (NULL != given_localname) &&
AXIS2_STRCMP(child_localname, given_localname) == 0)
{
*child_node = child;
@@ -547,19 +547,19 @@
}
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
size = AXIS2_ARRAY_LIST_SIZE(names, env);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
for (i = 0; i < size; i++)
{
given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
- if ((NULL != child_localname) && (NULL != given_localname) &&
+ if ((child_localname) && (NULL != given_localname) &&
(AXIS2_STRCMP(child_localname, given_localname) == 0))
{
*child_node = next_sibling;
@@ -599,20 +599,20 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
- while (NULL != child)
+ while (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
- if (NULL != om_ele)
+ if (om_ele)
{
size = AXIS2_ARRAY_LIST_SIZE(names, env);
for (i = 0; i < size; i++)
{
given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname && (NULL != given_localname) &&
+ if (child_localname && (NULL != given_localname) &&
(AXIS2_STRCMP(child_localname, given_localname) == 0))
{
*child_node = child;
@@ -649,20 +649,20 @@
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
size = AXIS2_ARRAY_LIST_SIZE(names, env);
for (i = 0; i < size; i++)
{
given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if ((NULL != ele_localname) && (NULL != given_localname) &&
+ if ((ele_localname) && (NULL != given_localname) &&
(AXIS2_STRCMP(given_localname, ele_localname) == 0))
{
*next_node = next_sibling;
@@ -707,20 +707,20 @@
child = AXIOM_NODE_GET_FIRST_CHILD(ele_node, env);
- if (NULL != child)
+ if (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(child, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+ if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
{
attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
- if (NULL != attr_ht)
+ if (attr_ht)
{
for (hi = axis2_hash_first(attr_ht, env); hi;
@@ -728,7 +728,7 @@
{
void *val = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
- if (NULL != val)
+ if (val)
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
@@ -736,7 +736,7 @@
om_attr_value =
AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
- if (NULL != om_attr_name && NULL != om_attr_value &&
+ if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
@@ -759,18 +759,18 @@
}
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(child, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
+ if (child_localname && AXIS2_STRCMP(child_localname, localname) == 0)
{
attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
- if (NULL != attr_ht)
+ if (attr_ht)
{
for (hi = axis2_hash_first(attr_ht, env); hi;
@@ -778,7 +778,7 @@
{
void *val = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
- if (NULL != val)
+ if (val)
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
@@ -787,7 +787,7 @@
om_attr_value =
AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
- if (NULL != om_attr_name && NULL != om_attr_value &&
+ if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
@@ -836,20 +836,20 @@
AXIS2_PARAM_CHECK(env->error, child_node, NULL);
child = AXIOM_NODE_GET_LAST_CHILD(ele_node, env);
- while (NULL != child)
+ while (child)
{
if (AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t*)
AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
- if (NULL != om_ele)
+ if (om_ele)
{
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != child_localname &&
+ if (child_localname &&
AXIS2_STRCMP(child_localname, localname) == 0)
{
attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
- if (NULL != attr_ht)
+ if (attr_ht)
{
for (hi = axis2_hash_first(attr_ht, env); hi;
@@ -857,7 +857,7 @@
{
void *val = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
- if (NULL != val)
+ if (val)
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
@@ -866,7 +866,7 @@
om_attr_value =
AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
- if (NULL != om_attr_name && NULL != om_attr_value &&
+ if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
@@ -914,19 +914,19 @@
next_sibling = AXIOM_NODE_GET_NEXT_SIBLING(ele_node, env);
- while (NULL != next_sibling)
+ while (next_sibling)
{
if (AXIOM_NODE_GET_NODE_TYPE(next_sibling, env) == AXIOM_ELEMENT)
{
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
- if (NULL != om_ele)
+ if (om_ele)
{
ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
+ if (ele_localname && AXIS2_STRCMP(localname, ele_localname) == 0)
{
attr_ht = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(om_ele, env);
- if (NULL != attr_ht)
+ if (attr_ht)
{
for (hi = axis2_hash_first(attr_ht, env); hi;
@@ -934,7 +934,7 @@
{
void *val = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
- if (NULL != val)
+ if (val)
{
om_attr = (axiom_attribute_t *)val;
om_attr_name =
@@ -943,7 +943,7 @@
om_attr_value =
AXIOM_ATTRIBUTE_GET_VALUE(om_attr, env);
- if (NULL != om_attr_name && NULL != om_attr_value &&
+ if (om_attr_name && NULL != om_attr_value &&
AXIS2_STRCMP(om_attr_name, attr_name) == 0 &&
AXIS2_STRCMP(om_attr_value, attr_value) == 0)
{
@@ -981,7 +981,7 @@
om_ele = (axiom_element_t *)
AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if (NULL != om_ele)
+ if (om_ele)
{
return AXIOM_ELEMENT_GET_TEXT(om_ele, env, om_node);
}
@@ -1000,7 +1000,7 @@
if (AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
return NULL;
om_ele = (axiom_element_t *)AXIOM_NODE_GET_NODE_TYPE(node, env);
- if (NULL != om_ele)
+ if (om_ele)
return AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
return NULL;
}
@@ -1019,7 +1019,7 @@
if (NULL == om_ele)
return NULL;
om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
- if (NULL != om_ns)
+ if (om_ns)
return AXIOM_NAMESPACE_GET_URI(om_ns, env);
}
return NULL;
@@ -1036,7 +1036,7 @@
AXIS2_PARAM_CHECK(env->error, om_ele, NULL);
first_ele =
AXIOM_ELEMENT_GET_FIRST_ELEMENT(om_ele, env, om_node, &first_node);
- if (NULL != first_ele)
+ if (first_ele)
{
return axiom_child_element_iterator_create(env, first_node);
}
Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Mon Sep 18 18:39:03 2006
@@ -48,54 +48,54 @@
if (buffer)
pos = strstr(buffer, "---");
if (pos)
- {
- len = pos - buffer;
- *pos = '\0';
- }
- return len;
-}
-
-int
-test_om_build(const char *filename)
-{
- axiom_element_t *ele1 = NULL, *ele2 = NULL;
- axiom_stax_builder_t *builder = NULL;
- axiom_text_t *text = NULL;
- axiom_document_t *document = NULL;
- axiom_node_t *node1 = NULL, *node2 = NULL;
- axiom_output_t *om_output = NULL;
- axiom_namespace_t* ns = NULL;
- axiom_xml_reader_t *reader = NULL;
- axiom_xml_writer_t *writer = NULL;
- char *buffer = NULL;
- f = fopen(filename, "r");
- if (!f)
- return -1;
-
- /** create pull parser */
- reader = axiom_xml_reader_create_for_io(environment, read_input, NULL , NULL, NULL);
-
- if (!reader)
- {
- printf("ERROR CREATING PULLPARSER");
- return -1;
- }
- /** create axiom_stax_builder by parsing pull_parser struct */
-
- builder = axiom_stax_builder_create(environment, reader);
-
- if (!builder)
- {
- printf("ERROR CREATING PULL PARSER");
- return -1;
- }
- /**
- create an om document
- document is the container of om model created using builder
- */
-
- document = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, environment);
- /**
+ {
+ len = pos - buffer;
+ *pos = '\0';
+ }
+ return len;
+}
+
+int
+test_om_build(const char *filename)
+{
+ axiom_element_t *ele1 = NULL, *ele2 = NULL;
+ axiom_stax_builder_t *builder = NULL;
+ axiom_text_t *text = NULL;
+ axiom_document_t *document = NULL;
+ axiom_node_t *node1 = NULL, *node2 = NULL;
+ axiom_output_t *om_output = NULL;
+ axiom_namespace_t* ns = NULL;
+ axiom_xml_reader_t *reader = NULL;
+ axiom_xml_writer_t *writer = NULL;
+ char *buffer = NULL;
+ f = fopen(filename, "r");
+ if (!f)
+ return -1;
+
+ /** create pull parser */
+ reader = axiom_xml_reader_create_for_io(environment, read_input, NULL , NULL, NULL);
+
+ if (!reader)
+ {
+ printf("ERROR CREATING PULLPARSER");
+ return -1;
+ }
+ /** create axiom_stax_builder by parsing pull_parser struct */
+
+ builder = axiom_stax_builder_create(environment, reader);
+
+ if (!builder)
+ {
+ printf("ERROR CREATING PULL PARSER");
+ return -1;
+ }
+ /**
+ create an om document
+ document is the container of om model created using builder
+ */
+
+ document = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, environment);
+ /**
get root element , building starts hear
*/
if (!document)
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Mon Sep 18 18:39:03 2006
@@ -85,7 +85,7 @@
return AXIS2_FAILURE;
localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
- if (NULL != localname)
+ if (localname)
printf("\n %s \n", localname);
om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
@@ -161,33 +161,33 @@
om_node = AXIOM_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
- if (NULL != om_node)
+ if (om_node)
printnode(om_node, env);
soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
- if (NULL != soap_header)
+ if (soap_header)
{
om_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
- if (NULL != om_node)
+ if (om_node)
printnode(om_node, env);
children_iter = AXIOM_SOAP_HEADER_EXAMINE_ALL_HEADER_BLOCKS(soap_header, env);
- if (NULL != children_iter)
+ if (children_iter)
{
while (AXIOM_CHILDREN_ITERATOR_HAS_NEXT(children_iter, env))
{
om_node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
- if (NULL != om_node)
+ if (om_node)
printnode(om_node, env);
}
}
}
soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
- if (NULL != soap_body)
+ if (soap_body)
{
om_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
- if (NULL != om_node)
+ if (om_node)
printnode(om_node, env);
else
printf("\n\n soap body base node null \n\n");
@@ -242,7 +242,7 @@
printf("\n\nThe serialized xml is >>>>>>>>>>>>>\n\n\n%s \n\n\n", buffer);
- if (NULL != buffer)
+ if (buffer)
AXIS2_FREE(env->allocator, buffer);
AXIOM_SOAP_ENVELOPE_FREE(soap_envelope, env);
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Mon Sep 18 18:39:03 2006
@@ -705,7 +705,7 @@
else if (c == '&')
ref = 1;
else if (c == -1) /* first should check for eof then
- only check of r != < */
+ only check of r != < */
{
guththila_close_token(environment, parser,
_char_data, ref);
Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Mon Sep 18 18:39:03 2006
@@ -298,7 +298,7 @@
const axis2_char_t *address)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != AXIS2_INTF_TO_IMPL(endpoint_ref)->address)
+ if (AXIS2_INTF_TO_IMPL(endpoint_ref)->address)
{
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(endpoint_ref)->address);
AXIS2_INTF_TO_IMPL(endpoint_ref)->address = NULL;
Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Mon Sep 18 18:39:03 2006
@@ -356,8 +356,8 @@
msg_info_headers_impl = AXIS2_INTF_TO_IMPL(msg_info_headers);
if (msg_info_headers_impl->to && to) /* if the incoming to is NULL,
- we consider that to be a reset,
- so don't free */
+ we consider that to be a reset,
+ so don't free */
{
AXIS2_ENDPOINT_REF_FREE(msg_info_headers_impl->to, env);
msg_info_headers_impl->to = NULL;
@@ -442,12 +442,12 @@
const axis2_char_t *action)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
+ if (AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
{
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(msg_info_headers)->action);
AXIS2_INTF_TO_IMPL(msg_info_headers)->action = NULL;
}
- if (NULL != action)
+ if (action)
AXIS2_INTF_TO_IMPL(msg_info_headers)->action = AXIS2_STRDUP(action, env);
return AXIS2_SUCCESS;
}
@@ -598,7 +598,7 @@
AXIS2_ARRAY_LIST_FREE(msg_info_headers_impl->ref_params, env);
msg_info_headers_impl->ref_params = NULL;
}
- if (NULL != AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
+ if (AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
{
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(msg_info_headers)->action);
AXIS2_INTF_TO_IMPL(msg_info_headers)->action = NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Sep 18 18:39:03 2006
@@ -700,7 +700,7 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, property,
AXIS2_FALSE);
- if (NULL != engine)
+ if (engine)
{
AXIS2_ENGINE_FREE(engine, env);
engine = NULL;
@@ -790,7 +790,7 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_IN, property,
AXIS2_FALSE);
- if (NULL != engine)
+ if (engine)
{
AXIS2_ENGINE_FREE(engine, env);
engine = NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Sep 18 18:39:03 2006
@@ -450,7 +450,7 @@
msg_id = (axis2_char_t*)axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_MESSAGE_ID(msg_ctx, env, msg_id);
- if (NULL != msg_id)
+ if (msg_id)
{
AXIS2_FREE(env->allocator, msg_id);
msg_id = NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Sep 18 18:39:03 2006
@@ -681,7 +681,7 @@
{
return AXIS2_FAILURE;
}
- if (NULL != svc_client_impl->op_client)
+ if (svc_client_impl->op_client)
{
/** free op_client of previous message
AXIS2_OP_CLIENT_FREE(svc_client_impl->op_client);
@@ -730,7 +730,7 @@
return;
}
- if (NULL != svc_client_impl->op_client)
+ if (svc_client_impl->op_client)
{
/** free previous op_client
AXIS2_OP_CLIENT_FREE(op_client, env);
@@ -871,7 +871,7 @@
{
return NULL;
}
- if (NULL != svc_client_impl->op_client)
+ if (svc_client_impl->op_client)
{
/** free op_client of previous request
AXIS2_OP_CLIENT_FREE(svc_client_impl->op_client);
@@ -942,7 +942,7 @@
{
return;
}
- if (NULL != svc_client_impl->op_client)
+ if (svc_client_impl->op_client)
{
/** free op_client of previous request
AXIS2_OP_CLIENT_FREE(svc_client_impl->op_client, env);
@@ -1333,7 +1333,7 @@
svc_client_impl->options = NULL;
}
- if (NULL != svc_client_impl->listener_manager)
+ if (svc_client_impl->listener_manager)
{
AXIS2_LISTNER_MANAGER_FREE(svc_client_impl->listener_manager, env);
svc_client_impl->listener_manager = NULL;
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Sep 18 18:39:03 2006
@@ -1783,7 +1783,7 @@
if (msg_info_headers)
{
- if (NULL != AXIS2_INTF_TO_IMPL(msg_ctx)->msg_info_headers)
+ if (AXIS2_INTF_TO_IMPL(msg_ctx)->msg_info_headers)
{
AXIS2_MSG_INFO_HEADERS_FREE(
AXIS2_INTF_TO_IMPL(msg_ctx)->msg_info_headers, env);
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Mon Sep 18 18:39:03 2006
@@ -319,7 +319,7 @@
file_data_impl->deployable_svcs = NULL;
}
- if (NULL != arch_file_data->ops)
+ if (arch_file_data->ops)
{
AXIS2_FREE(env->allocator, arch_file_data->ops);
arch_file_data->ops = NULL;
@@ -387,7 +387,7 @@
AXIS2_ENV_CHECK(env, NULL);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
- if (NULL != file_data_impl->file)
+ if (file_data_impl->file)
{
svc_name = AXIS2_FILE_GET_NAME(file_data_impl->file, env);
}
@@ -428,7 +428,7 @@
AXIS2_ENV_CHECK(env, NULL);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
- if (NULL != file_data_impl->file)
+ if (file_data_impl->file)
{
module_name = AXIS2_FILE_GET_NAME(file_data_impl->file, env);
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Mon Sep 18 18:39:03 2006
@@ -136,7 +136,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
arch_reader_impl = AXIS2_INTF_TO_IMPL(arch_reader);
- if (NULL != arch_reader->ops)
+ if (arch_reader->ops)
AXIS2_FREE(env->allocator, arch_reader->ops);
if (arch_reader_impl->desc_builder)
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Mon Sep 18 18:39:03 2006
@@ -173,7 +173,7 @@
conf_builder->desc_builder = NULL;
}
- if (NULL != conf_builder->ops)
+ if (conf_builder->ops)
{
AXIS2_FREE(env->allocator, conf_builder->ops);
conf_builder->ops = NULL;
@@ -268,7 +268,7 @@
disp_order_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
conf_element, env, qdisporder, conf_node, &disp_order_node);
AXIS2_QNAME_FREE(qdisporder, env);
- if (NULL != disp_order_element)
+ if (disp_order_element)
{
axis2_conf_builder_process_disp_order(conf_builder, env, disp_order_node);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "found the custom disptaching \
@@ -322,7 +322,7 @@
def_mod_versions = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element,
env, qdefmodver, conf_node);
AXIS2_QNAME_FREE(qdefmodver, env);
- if (NULL != def_mod_versions)
+ if (def_mod_versions)
{
status = axis2_conf_builder_process_default_module_versions(conf_builder
, env, def_mod_versions);
@@ -699,7 +699,7 @@
qattname);
}
AXIS2_QNAME_FREE(qattname, env);
- if (NULL != trs_name)
+ if (trs_name)
{
axis2_char_t *name = NULL;
axiom_attribute_t *trs_dll_att = NULL;
@@ -807,7 +807,7 @@
in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
transport_element, env, qinflowst, transport_node, &in_flow_node);
AXIS2_QNAME_FREE(qinflowst, env);
- if (NULL != in_flow_element)
+ if (in_flow_element)
{
AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
AXIS2_ERROR_SET(env->error,
@@ -818,7 +818,7 @@
out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
transport_element, env, qoutflowst, transport_node, &out_flow_node);
AXIS2_QNAME_FREE(qoutflowst, env);
- if (NULL != out_flow_element)
+ if (out_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -840,7 +840,7 @@
transport_element, env, qinfaultflowst, transport_node,
&in_fault_flow_node);
AXIS2_QNAME_FREE(qinfaultflowst, env);
- if (NULL != in_fault_flow_element)
+ if (in_fault_flow_element)
{
AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
AXIS2_ERROR_SET(env->error,
@@ -854,7 +854,7 @@
transport_element, env, qoutfaultflowst, transport_node,
&out_fault_flow_node);
AXIS2_QNAME_FREE(qoutfaultflowst, env);
- if (NULL != out_fault_flow_element)
+ if (out_fault_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -927,7 +927,7 @@
qattname);
AXIS2_QNAME_FREE(qattname, env);
- if (NULL != trs_name)
+ if (trs_name)
{
axis2_char_t *name = NULL;
axiom_attribute_t *trs_class_name = NULL;
@@ -965,7 +965,7 @@
class_qname);
AXIS2_QNAME_FREE(class_qname, env);
- if (NULL != trs_class_name)
+ if (trs_class_name)
{
axis2_char_t *class_name = NULL;
axis2_char_t *dll_name = NULL;
@@ -1031,7 +1031,7 @@
out_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
transport_element, env, qoutflowst, transport_node, &out_flow_node);
AXIS2_QNAME_FREE(qoutflowst, env);
- if (NULL != out_flow_element)
+ if (out_flow_element)
{
AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
AXIS2_ERROR_SET(env->error,
@@ -1043,7 +1043,7 @@
in_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
transport_element, env, qinflowst, transport_node, &in_flow_node);
AXIS2_QNAME_FREE(qinflowst, env);
- if (NULL != in_flow_element)
+ if (in_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -1065,7 +1065,7 @@
transport_element, env, qinfaultflowst, transport_node,
&in_fault_flow_node);
AXIS2_QNAME_FREE(qinfaultflowst, env);
- if (NULL != in_fault_flow_element)
+ if (in_fault_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -1086,7 +1086,7 @@
out_fault_flow_element = AXIOM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
transport_element, env, qoutfaultflowst, transport_node,
&out_fault_flow_node);
- if (NULL != out_fault_flow_element)
+ if (out_fault_flow_element)
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_OUT_FLOW_NOT_ALLOWED_IN_TRS_IN, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Sep 18 18:39:03 2006
@@ -588,7 +588,7 @@
dep_engine_impl->repos_listener = NULL;
}
- if (NULL != dep_engine->ops)
+ if (dep_engine->ops)
{
AXIS2_FREE(env->allocator, dep_engine->ops);
dep_engine->ops = NULL;
@@ -727,7 +727,7 @@
para_hot_update = AXIS2_CONF_GET_PARAM(dep_engine_impl->conf, env,
AXIS2_HOTUPDATE);
- if (NULL != para_hot_dep)
+ if (para_hot_dep)
{
value = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(para_hot_dep, env);
if (0 == AXIS2_STRCASECMP("false", value))
@@ -735,7 +735,7 @@
dep_engine_impl->hot_dep = AXIS2_FALSE;
}
}
- if (NULL != para_hot_update)
+ if (para_hot_update)
{
value = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(para_hot_update, env);
if (0 == AXIS2_STRCASECMP("false", value))
@@ -871,7 +871,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- if (NULL != client_home && 0 != AXIS2_STRCMP("", client_home))
+ if (client_home && 0 != AXIS2_STRCMP("", client_home))
{
status = axis2_dep_engine_check_client_home(dep_engine, env, client_home);
if (AXIS2_SUCCESS == status)
@@ -1109,7 +1109,7 @@
env, j);
module_desc = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
qmodulename);
- if (NULL != module_desc)
+ if (module_desc)
{
AXIS2_SVC_ENGAGE_MODULE(svc, env, module_desc, dep_engine_impl->conf);
@@ -1136,7 +1136,7 @@
env, j);
module_desc = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
qmodulename);
- if (NULL != module_desc)
+ if (module_desc)
{
AXIS2_SVC_ENGAGE_MODULE(svc, env, module_desc, dep_engine_impl->conf);
@@ -1177,7 +1177,7 @@
module = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
module_qname);
- if (NULL != module)
+ if (module)
{
AXIS2_OP_ENGAGE_MODULE(op_desc, env, module,
dep_engine_impl->conf);
@@ -1212,25 +1212,25 @@
dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
in_flow = AXIS2_SVC_GET_IN_FLOW(svc, env);
- if (NULL != in_flow)
+ if (in_flow)
{
axis2_dep_engine_add_flow_handlers(dep_engine, env, in_flow);
}
out_flow = AXIS2_SVC_GET_OUT_FLOW(svc, env);
- if (NULL != out_flow)
+ if (out_flow)
{
axis2_dep_engine_add_flow_handlers(dep_engine, env, out_flow);
}
in_fault_flow = AXIS2_SVC_GET_FAULT_IN_FLOW(svc, env);
- if (NULL != in_fault_flow)
+ if (in_fault_flow)
{
axis2_dep_engine_add_flow_handlers(dep_engine, env, in_fault_flow);
}
out_fault_flow = AXIS2_SVC_GET_FAULT_OUT_FLOW(svc, env);
- if (NULL != out_fault_flow)
+ if (out_fault_flow)
{
axis2_dep_engine_add_flow_handlers(dep_engine, env, out_fault_flow);
}
@@ -1443,28 +1443,28 @@
}
in_flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_metadata, env);
- if (NULL != in_flow)
+ if (in_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_flow,
module->handler_create_func_map);
}
out_flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_metadata, env);
- if (NULL != out_flow)
+ if (out_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_flow,
module->handler_create_func_map);
}
in_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_metadata, env);
- if (NULL != in_fault_flow)
+ if (in_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_fault_flow,
module->handler_create_func_map);
}
out_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_metadata, env);
- if (NULL != out_fault_flow)
+ if (out_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_fault_flow,
module->handler_create_func_map);
@@ -1541,7 +1541,7 @@
break;
case AXIS2_MODULE:
arch_reader = axis2_arch_reader_create(env);
- if (NULL != dep_engine_impl->arch_reader)
+ if (dep_engine_impl->arch_reader)
{
AXIS2_ARCH_READER_FREE(dep_engine_impl->arch_reader, env);
}
@@ -1757,28 +1757,28 @@
AXIS2_MODULE_FILL_HANDLER_CREATE_FUNC_MAP(module, env);
in_flow = AXIS2_MODULE_DESC_GET_IN_FLOW(module_desc, env);
- if (NULL != in_flow)
+ if (in_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_flow,
module->handler_create_func_map);
}
out_flow = AXIS2_MODULE_DESC_GET_OUT_FLOW(module_desc, env);
- if (NULL != out_flow)
+ if (out_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_flow,
module->handler_create_func_map);
}
in_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_IN_FLOW(module_desc, env);
- if (NULL != in_fault_flow)
+ if (in_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, in_fault_flow,
module->handler_create_func_map);
}
out_fault_flow = AXIS2_MODULE_DESC_GET_FAULT_OUT_FLOW(module_desc, env);
- if (NULL != out_fault_flow)
+ if (out_fault_flow)
{
axis2_dep_engine_add_module_flow_handlers(dep_engine, env, out_fault_flow,
module->handler_create_func_map);
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Mon Sep 18 18:39:03 2006
@@ -251,7 +251,7 @@
/* we cannot free deployment engine here */
desc_builder->engine = NULL;
- if (NULL != desc_builder->ops)
+ if (desc_builder->ops)
AXIS2_FREE(env->allocator, desc_builder->ops);
if (desc_builder_impl)
@@ -493,7 +493,7 @@
index_i = axis2_hash_first(order_itr, env);
- while (NULL != index_i)
+ while (index_i)
{
axiom_attribute_t *order_attrib = NULL;
axis2_qname_t *qname = NULL;
@@ -876,7 +876,7 @@
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_attrib = AXIOM_ELEMENT_GET_ATTRIBUTE(moduleref, env, qref);
AXIS2_QNAME_FREE(qref, env);
- if (NULL != module_ref_attrib)
+ if (module_ref_attrib)
{
axis2_char_t *ref_name = NULL;
axis2_qname_t *ref_qname = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Mon Sep 18 18:39:03 2006
@@ -136,7 +136,7 @@
module_builder->desc_builder = NULL;
}
- if (NULL != module_builder->ops)
+ if (module_builder->ops)
{
AXIS2_FREE(env->allocator, module_builder->ops);
module_builder->ops = NULL;
@@ -201,12 +201,12 @@
qattname);
if(qattname)
AXIS2_QNAME_FREE(qattname, env);
- if(NULL != module_name_att)
+ if( module_name_att)
{
axis2_char_t *module_name = NULL;
module_name = AXIOM_ATTRIBUTE_GET_VALUE(module_name_att, env);
- if(NULL != module_name && (0 != AXIS2_STRCMP("", module_name)))
+ if( module_name && (0 != AXIS2_STRCMP("", module_name)))
{
axis2_qname_t *qmodule_name = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Populate module %s", module_name);
@@ -257,15 +257,15 @@
if (qdllname)
AXIS2_QNAME_FREE(qdllname, env);
- if (NULL != module_dll_att)
+ if (module_dll_att)
{
axis2_char_t *class_name = NULL;
class_name = AXIOM_ATTRIBUTE_GET_VALUE(module_dll_att, env);
- if (NULL != class_name && (0 != AXIS2_STRCMP("", class_name)))
+ if (class_name && (0 != AXIS2_STRCMP("", class_name)))
{
- if (NULL != module_builder->desc_builder->engine)
+ if (module_builder->desc_builder->engine)
{
axis2_arch_file_data_t *file_data = NULL;
@@ -300,7 +300,7 @@
if (qinflowst)
AXIS2_QNAME_FREE(qinflowst, env);
- if (NULL != in_flow_element && NULL != in_flow_node)
+ if (in_flow_element && NULL != in_flow_node)
{
axis2_flow_t *flow = NULL;
@@ -322,7 +322,7 @@
if (qoutflowst)
AXIS2_QNAME_FREE(qoutflowst, env);
- if (NULL != out_flow_element && NULL != out_flow_node)
+ if (out_flow_element && NULL != out_flow_node)
{
axis2_flow_t *flow = NULL;
@@ -343,7 +343,7 @@
if (qinfaultflow)
AXIS2_QNAME_FREE(qinfaultflow, env);
- if (NULL != in_fault_flow_element && NULL != in_fault_flow_node)
+ if (in_fault_flow_element && NULL != in_fault_flow_node)
{
axis2_flow_t *flow = NULL;
@@ -364,7 +364,7 @@
if (qoutfaultflow)
AXIS2_QNAME_FREE(qoutfaultflow, env);
- if (NULL != out_fault_flow_element && NULL != out_fault_flow_node)
+ if (out_fault_flow_element && NULL != out_fault_flow_node)
{
axis2_flow_t *flow = NULL;
@@ -457,7 +457,7 @@
if (qmep)
AXIS2_QNAME_FREE(qmep, env);
- if (NULL != op_mep_att)
+ if (op_mep_att)
{
mep_url = AXIOM_ATTRIBUTE_GET_VALUE(op_mep_att, env);
}
@@ -497,7 +497,7 @@
env, qmsgrecv, op_node, &recv_node);
if (qmsgrecv)
AXIS2_QNAME_FREE(qmsgrecv, env);
- if (NULL != recv_element && NULL != recv_node)
+ if (recv_element && NULL != recv_node)
{
axis2_msg_recv_t *msg_recv = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Mon Sep 18 18:39:03 2006
@@ -228,13 +228,13 @@
phases_info_impl->out_faultphases = NULL;
}
- if (NULL != phases_info->ops)
+ if (phases_info->ops)
{
AXIS2_FREE(env->allocator, phases_info->ops);
phases_info->ops = NULL;
}
- if (NULL != phases_info_impl)
+ if (phases_info_impl)
{
AXIS2_FREE(env->allocator, phases_info_impl);
phases_info_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Mon Sep 18 18:39:03 2006
@@ -210,7 +210,7 @@
listener_impl->info_list = NULL;
}
- if (NULL != repos_listener->ops)
+ if (repos_listener->ops)
{
AXIS2_FREE(env->allocator, repos_listener->ops);
repos_listener->ops = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Sep 18 18:39:03 2006
@@ -194,7 +194,7 @@
svc_builder_impl->svc = NULL;
- if (NULL != svc_builder->ops)
+ if (svc_builder->ops)
{
AXIS2_FREE(env->allocator, svc_builder->ops);
svc_builder->ops = NULL;
@@ -294,7 +294,7 @@
qdesc, svc_node, &desc_node);
AXIS2_QNAME_FREE(qdesc, env) ;
qdesc = NULL;
- if(NULL != desc_element)
+ if( desc_element)
{
axiom_element_t *desc_value_element = NULL;
axiom_node_t *desc_value_node = NULL;
@@ -303,7 +303,7 @@
desc_value_element = AXIOM_ELEMENT_GET_FIRST_ELEMENT(desc_element,
env, desc_node, &desc_value_node);
- if(NULL != desc_value_element && NULL != desc_value_node)
+ if( desc_value_element && NULL != desc_value_node)
{
axis2_char_t *svc_name = NULL;
@@ -398,7 +398,7 @@
env, qinflowst, svc_node, &in_flow_node);
AXIS2_QNAME_FREE(qinflowst, env) ;
qinflowst = NULL;
- if (in_flow_element != NULL && NULL != in_flow_node)
+ if (in_flow_element && in_flow_node)
{
axis2_flow_t *flow = NULL;
@@ -417,7 +417,7 @@
env, qoutflowst, svc_node, &out_flow_node);
AXIS2_QNAME_FREE(qoutflowst, env) ;
qoutflowst = NULL;
- if (NULL != out_flow_element && NULL != out_flow_node)
+ if (out_flow_element && NULL != out_flow_node)
{
axis2_flow_t *flow = NULL;
@@ -437,7 +437,7 @@
AXIS2_QNAME_FREE(qin_faultflowst, env) ;
qin_faultflowst = NULL;
- if (in_faultflow_element != NULL && NULL != in_faultflow_node)
+ if (in_faultflow_element && in_faultflow_node)
{
axis2_flow_t *flow = NULL;
@@ -457,7 +457,7 @@
env, qoutflowst, svc_node, &out_faultflow_node);
AXIS2_QNAME_FREE(qout_faultflowst, env) ;
qout_faultflowst = NULL;
- if (NULL != out_faultflow_element && NULL != out_faultflow_node)
+ if (out_faultflow_element && NULL != out_faultflow_node)
{
axis2_flow_t *flow = NULL;
@@ -578,7 +578,7 @@
op_mep_att = AXIOM_ELEMENT_GET_ATTRIBUTE(op_element, env, qmep);
AXIS2_QNAME_FREE(qmep, env);
qmep = NULL;
- if (NULL != op_mep_att)
+ if (op_mep_att)
{
mep_url = AXIOM_ATTRIBUTE_GET_VALUE(op_mep_att, env);
/*
@@ -639,7 +639,7 @@
env, qmsgrecv, op_node, &recv_node);
AXIS2_QNAME_FREE(qmsgrecv, env);
qmsgrecv = NULL;
- if (NULL != recv_element && NULL != recv_node)
+ if (recv_element && NULL != recv_node)
{
axis2_msg_recv_t *msg_recv = NULL;
msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(svc_builder->desc_builder,
@@ -667,7 +667,7 @@
return AXIS2_FAILURE;
}
/* setting operation phase */
- if (NULL != svc_builder->desc_builder->engine)
+ if (svc_builder->desc_builder->engine)
{
axis2_phases_info_t *info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(
svc_builder->desc_builder->engine, env);
@@ -743,7 +743,7 @@
module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element,
env, qref);
AXIS2_QNAME_FREE(qref, env);
- if (NULL != module_ref_att)
+ if (module_ref_att)
{
axis2_char_t *ref_name = NULL;
axis2_qname_t *qrefname = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Sep 18 18:39:03 2006
@@ -139,7 +139,7 @@
env);
grp_builder_impl->svc_grp_builder.desc_builder = NULL;
}
- if (NULL != svc_grp_builder->ops)
+ if (svc_grp_builder->ops)
{
AXIS2_FREE(env->allocator, svc_grp_builder->ops);
svc_grp_builder->ops = NULL;
@@ -276,7 +276,7 @@
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = AXIOM_ELEMENT_GET_ATTRIBUTE(module_ref_element, env,
qref);
- if (NULL != module_ref_att)
+ if (module_ref_att)
{
axis2_char_t *ref_name = NULL;
axis2_qname_t *qrefname = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Mon Sep 18 18:39:03 2006
@@ -166,13 +166,13 @@
ws_info_impl = AXIS2_INTF_TO_IMPL(ws_info);
- if (NULL != ws_info->ops)
+ if (ws_info->ops)
{
AXIS2_FREE(env->allocator, ws_info->ops);
ws_info->ops = NULL;
}
- if (NULL != ws_info_impl->file_name)
+ if (ws_info_impl->file_name)
{
AXIS2_FREE(env->allocator, ws_info_impl->file_name);
ws_info_impl->file_name = NULL;
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Mon Sep 18 18:39:03 2006
@@ -209,7 +209,7 @@
AXIS2_ARRAY_LIST_FREE(info_list_impl->info_list, env);
info_list_impl->info_list = NULL;
}
- if (NULL != ws_info_list->ops)
+ if (ws_info_list->ops)
AXIS2_FREE(env->allocator, ws_info_list->ops);
if (info_list_impl)
Modified: webservices/axis2/trunk/c/modules/core/description/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/desc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/desc.c Mon Sep 18 18:39:03 2006
@@ -154,7 +154,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
desc_impl = AXIS2_INTF_TO_IMPL(desc);
- if (NULL != desc_impl->children)
+ if (desc_impl->children)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -251,7 +251,7 @@
param_l = axis2_desc_get_param(desc, env, param_name);
- return (param_l != NULL && AXIS2_PARAM_IS_LOCKED(param_l, env));
+ return (param_l && AXIS2_PARAM_IS_LOCKED(param_l, env));
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Mon Sep 18 18:39:03 2006
@@ -102,7 +102,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
flow_impl = AXIS2_INTF_TO_IMPL(flow);
- if (NULL != flow_impl->list)
+ if (flow_impl->list)
{
int i = 0;
int size = 0;
@@ -120,7 +120,7 @@
flow_impl->list = NULL;
}
- if (NULL != flow->ops)
+ if (flow->ops)
{
AXIS2_FREE(env->allocator, flow->ops);
flow->ops = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/flow_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow_container.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow_container.c Mon Sep 18 18:39:03 2006
@@ -149,31 +149,31 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
container_impl = AXIS2_INTF_TO_IMPL(flow_container);
- if (NULL != container_impl->in)
+ if (container_impl->in)
{
AXIS2_FLOW_FREE(container_impl->in, env);
container_impl->in = NULL;
}
- if (NULL != container_impl->out)
+ if (container_impl->out)
{
AXIS2_FLOW_FREE(container_impl->out, env);
container_impl->out = NULL;
}
- if (NULL != container_impl->in_fault)
+ if (container_impl->in_fault)
{
AXIS2_FLOW_FREE(container_impl->in_fault, env);
container_impl->in_fault = NULL;
}
- if (NULL != container_impl->out_fault)
+ if (container_impl->out_fault)
{
AXIS2_FLOW_FREE(container_impl->out_fault, env);
container_impl->out_fault = NULL;
}
- if (NULL != flow_container->ops)
+ if (flow_container->ops)
AXIS2_FREE(env->allocator, flow_container->ops);
if (container_impl)
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Mon Sep 18 18:39:03 2006
@@ -364,7 +364,7 @@
if (handler)
handler_desc_impl->handler = handler; /* Shallow copy, but free method
- should free this */
+ should free this */
return AXIS2_SUCCESS;
}
@@ -425,8 +425,8 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(handler_desc)->parent = parent; /* shallow copy, because
- the parent lives
- somewhere else*/
+ the parent lives
+ somewhere else*/
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Mon Sep 18 18:39:03 2006
@@ -617,7 +617,7 @@
{
param_l = axis2_module_desc_get_param(module_desc, env,
param_name);
- if (NULL != param_l && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param_l, env))
+ if (param_l && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param_l, env))
ret_state = AXIS2_TRUE;
else
ret_state = AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Mon Sep 18 18:39:03 2006
@@ -212,7 +212,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
msg_impl = AXIS2_INTF_TO_IMPL(msg);
- if (NULL != msg_impl->flow)
+ if (msg_impl->flow)
{
int i = 0;
int size = 0;
@@ -232,7 +232,7 @@
msg_impl->flow = NULL;
}
- if (NULL != msg_impl->soap_headers)
+ if (msg_impl->soap_headers)
{
int i = 0;
int size = 0;
@@ -385,7 +385,7 @@
/* checking the locked status in parent */
parent_l = axis2_msg_get_parent(msg, env);
- if (NULL != parent_l)
+ if (parent_l)
{
locked = AXIS2_OP_IS_PARAM_LOCKED(parent_l, env, param_name);
}
@@ -397,7 +397,7 @@
{
param_l = axis2_msg_get_param(msg, env, param_name);
}
- return (param_l != NULL && AXIS2_PARAM_IS_LOCKED(param_l, env));
+ return (param_l && AXIS2_PARAM_IS_LOCKED(param_l, env));
}
axis2_status_t AXIS2_CALL
@@ -522,7 +522,7 @@
schema = AXIS2_ARRAY_LIST_GET(schemas, env, i);
schema_collection = XML_SCHEMA_GET_ITEMS(schema, env);
- if (NULL != schema_collection)
+ if (schema_collection)
{
int count = 0;
int j = 0;
@@ -538,7 +538,7 @@
{
axis2_qname_t *schema_qname = NULL;
schema_qname = XML_SCHEMA_ELEMENT_GET_QNAME(schema_obj, env);
- if (NULL != msg_impl->element_qname && AXIS2_TRUE ==
+ if (msg_impl->element_qname && AXIS2_TRUE ==
AXIS2_QNAME_EQUALS(msg_impl->element_qname, env,
schema_qname))
{
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Sep 18 18:39:03 2006
@@ -676,7 +676,7 @@
return NULL;
}
- if (NULL != op_impl->wsdl_op)
+ if (op_impl->wsdl_op)
{
AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
}
@@ -700,7 +700,7 @@
op_impl->base = NULL;
}
- if (NULL != op->param_container)
+ if (op->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(op->param_container, env);
op->param_container = NULL;
@@ -714,7 +714,7 @@
op_impl->msg_recv = NULL;
}
- if (NULL != op_impl->module_qnames)
+ if (op_impl->module_qnames)
{
int i = 0;
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->module_qnames, env); i++)
@@ -732,14 +732,14 @@
op_impl->module_qnames = NULL;
}
- if (NULL != op_impl->engaged_module_list)
+ if (op_impl->engaged_module_list)
{
AXIS2_ARRAY_LIST_FREE(op_impl->engaged_module_list, env);
op_impl->engaged_module_list = NULL;
}
- if (NULL != op_impl->wsdl_op)
+ if (op_impl->wsdl_op)
{
AXIS2_WSDL_OP_FREE(op_impl->wsdl_op, env);
op_impl->wsdl_op = NULL;
@@ -856,7 +856,7 @@
/* checking the locked value of parent */
parent = axis2_op_get_parent(op, env);
- if (NULL != parent)
+ if (parent)
{
locked = AXIS2_SVC_IS_PARAM_LOCKED(parent, env, param_name);
}
@@ -865,7 +865,7 @@
return AXIS2_TRUE;
}
param = axis2_op_get_param(op, env, param_name);
- return (param != NULL && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
+ return (param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
}
axis2_status_t AXIS2_CALL
@@ -1755,7 +1755,7 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if (NULL != op_ctx)
+ if (op_ctx)
{
return op_ctx;
}
@@ -1908,7 +1908,7 @@
AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE, AXIS2_HASH_KEY_STRING);
out_msg_ctx = (axis2_msg_ctx_t *) axis2_hash_get(mep,
AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE, AXIS2_HASH_KEY_STRING);
- if (NULL != in_msg_ctx && NULL != out_msg_ctx)
+ if (in_msg_ctx && NULL != out_msg_ctx)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MESSAGE_ADDITION,
AXIS2_FAILURE);
@@ -1948,7 +1948,7 @@
AXIS2_WSDL_MESSAGE_LABEL_IN_VALUE, AXIS2_HASH_KEY_STRING);
out_msg_ctx = (axis2_msg_ctx_t *) axis2_hash_get(mep,
AXIS2_WSDL_MESSAGE_LABEL_OUT_VALUE, AXIS2_HASH_KEY_STRING);
- if (NULL != in_msg_ctx && NULL != out_msg_ctx)
+ if (in_msg_ctx && NULL != out_msg_ctx)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MESSAGE_ADDITION,
AXIS2_FAILURE);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org