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 [3/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/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Mon Sep 18 18:39:03 2006
@@ -681,21 +681,21 @@
}
svc_impl->schema_loc_adjusted = AXIS2_FALSE;
- if (NULL != svc_impl->schema_target_ns_prefix)
+ if (svc_impl->schema_target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->schema_target_ns_prefix);
svc_impl->schema_target_ns_prefix = NULL;
}
svc_impl->schema_target_ns_prefix = AXIS2_STRDUP("ns", env);
- if (NULL != svc_impl->target_ns)
+ if (svc_impl->target_ns)
{
AXIS2_FREE(env->allocator, svc_impl->target_ns);
svc_impl->target_ns = NULL;
}
svc_impl->target_ns = AXIS2_STRDUP("http://ws.apache.org/axis2", env);
- if (NULL != svc_impl->target_ns_prefix)
+ if (svc_impl->target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->target_ns_prefix);
svc_impl->target_ns_prefix = NULL;
@@ -837,7 +837,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- if (NULL != svc_impl->svc.wsdl_svc)
+ if (svc_impl->svc.wsdl_svc)
{
AXIS2_WSDL_SVC_FREE(svc_impl->svc.wsdl_svc, env);
}
@@ -857,19 +857,19 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc->param_container)
+ if (svc->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(svc->param_container, env);
svc->param_container = NULL;
}
- if (NULL != svc->flow_container)
+ if (svc->flow_container)
{
AXIS2_FLOW_CONTAINER_FREE(svc->flow_container, env);
svc->flow_container = NULL;
}
- if (NULL != svc->wsdl_svc)
+ if (svc->wsdl_svc)
{
AXIS2_WSDL_SVC_FREE(svc->wsdl_svc, env);
svc->wsdl_svc = NULL;
@@ -883,7 +883,7 @@
svc_impl->parent = NULL;
- if (NULL != svc_impl->module_list)
+ if (svc_impl->module_list)
{
int i = 0;
int size = 0;
@@ -903,19 +903,19 @@
svc_impl->module_list = NULL;
}
- if (NULL != svc_impl->schema_list)
+ if (svc_impl->schema_list)
{
AXIS2_ARRAY_LIST_FREE(svc_impl->schema_list, env);
svc_impl->schema_list = NULL;
}
- if (NULL != svc_impl->axis_svc_name)
+ if (svc_impl->axis_svc_name)
{
AXIS2_FREE(env->allocator, svc_impl->axis_svc_name);
svc_impl->axis_svc_name = NULL;
}
- if (NULL != svc_impl->op_alias_map)
+ if (svc_impl->op_alias_map)
{
axis2_hash_index_t *hi = NULL;
void *val = NULL;
@@ -936,32 +936,32 @@
svc_impl->op_alias_map = NULL;
}
- if (NULL != svc_impl->op_action_map)
+ if (svc_impl->op_action_map)
{
axis2_hash_free(svc_impl->op_action_map, env);
svc_impl->op_action_map = NULL;
}
- if (NULL != svc_impl->schema_target_ns_prefix)
+ if (svc_impl->schema_target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->schema_target_ns_prefix);
svc_impl->schema_target_ns_prefix = NULL;
}
- if (NULL != svc_impl->target_ns)
+ if (svc_impl->target_ns)
{
AXIS2_FREE(env->allocator, svc_impl->target_ns);
svc_impl->target_ns = NULL;
}
- if (NULL != svc_impl->target_ns_prefix)
+ if (svc_impl->target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->target_ns_prefix);
svc_impl->target_ns_prefix = NULL;
}
- if (NULL != svc_impl->svc.ops)
+ if (svc_impl->svc.ops)
{
AXIS2_FREE(env->allocator, svc_impl->svc.ops);
svc_impl->svc.ops = NULL;
@@ -1724,7 +1724,7 @@
return NULL;
}
index = axis2_hash_first(endpoints, env);
- if (NULL != index)
+ if (index)
{
axis2_qname_t *endpoint_qname = NULL;
@@ -1768,7 +1768,7 @@
return NULL;
}
index_i = axis2_hash_first(binding_ops, env);
- while (NULL != index_i)
+ while (index_i)
{
int j = 0;
int size = 0;
@@ -2054,7 +2054,7 @@
AXIS2_PARAM_CHECK(env->error, table, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->schema_mapping_table)
+ if (svc_impl->schema_mapping_table)
{
axis2_hash_free(svc_impl->schema_mapping_table, env);
svc_impl->schema_mapping_table = NULL;
@@ -2082,7 +2082,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->custom_schema_name_prefix)
+ if (svc_impl->custom_schema_name_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->custom_schema_name_prefix);
svc_impl->custom_schema_name_prefix = NULL;
@@ -2115,7 +2115,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->custom_schema_name_suffix)
+ if (svc_impl->custom_schema_name_suffix)
{
AXIS2_FREE(env->allocator, svc_impl->custom_schema_name_suffix);
svc_impl->custom_schema_name_suffix = NULL;
@@ -2154,7 +2154,7 @@
axis2_char_t *buffer = NULL;
schema = AXIS2_ARRAY_LIST_GET(svc_impl->schema_list, env, i);
buffer = XML_SCHEMA_SERIALIZE(schema, env);
- if (NULL != buffer)
+ if (buffer)
{
AXIS2_STREAM_WRITE(out_stream, env, buffer, AXIS2_STRLEN(buffer));
}
@@ -2199,13 +2199,13 @@
{
return NULL;
}
- for (hi = axis2_hash_first(svc_impl->ns_map, env); NULL != hi;
+ for (hi = axis2_hash_first(svc_impl->ns_map, env); hi;
hi = axis2_hash_next(env, hi))
{
void * value = NULL;
void *key = NULL;
axis2_hash_this(hi, (const void **)&key, NULL, (void **)&value);
- if (NULL != value)
+ if (value)
{
axis2_hash_set(prefix_map, key, AXIS2_HASH_KEY_STRING, value);
}
@@ -2284,7 +2284,7 @@
AXIS2_PARAM_CHECK(env->error, ns, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->schema_target_ns)
+ if (svc_impl->schema_target_ns)
{
AXIS2_FREE(env->allocator, svc_impl->schema_target_ns);
svc_impl->schema_target_ns = NULL;
@@ -2314,7 +2314,7 @@
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->schema_target_ns_prefix)
+ if (svc_impl->schema_target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->schema_target_ns_prefix);
svc_impl->schema_target_ns_prefix = NULL;
@@ -2344,7 +2344,7 @@
AXIS2_PARAM_CHECK(env->error, ns, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->target_ns)
+ if (svc_impl->target_ns)
{
AXIS2_FREE(env->allocator, svc_impl->target_ns);
svc_impl->target_ns = NULL;
@@ -2374,7 +2374,7 @@
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->target_ns_prefix)
+ if (svc_impl->target_ns_prefix)
{
AXIS2_FREE(env->allocator, svc_impl->target_ns_prefix);
svc_impl->target_ns_prefix = NULL;
@@ -2400,11 +2400,11 @@
xml_schema_t *schema = NULL;
xml_schema_element_t *schema_element = NULL;
schema = AXIS2_ARRAY_LIST_GET(svc_impl->schema_list, env, i);
- if (NULL != schema)
+ if (schema)
{
schema_element = XML_SCHEMA_GET_ELEMENT_BY_QNAME(schema, env,
qname);
- if (NULL != schema_element)
+ if (schema_element)
{
return schema_element;
}
@@ -2436,21 +2436,21 @@
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->ns_map)
+ if (svc_impl->ns_map)
{
- for (hi = axis2_hash_first(svc_impl->ns_map, env); NULL != hi;
+ for (hi = axis2_hash_first(svc_impl->ns_map, env); hi;
hi = axis2_hash_next(env, hi))
{
void * value = NULL;
void *key = NULL;
axis2_hash_this(hi, (const void **)&key, NULL,
(void **)&value);
- if (NULL != key)
+ if (key)
{
AXIS2_FREE(env->allocator, key);
key = NULL;
}
- if (NULL != value)
+ if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
@@ -2476,9 +2476,9 @@
AXIS2_PARAM_CHECK(env->error, ns, AXIS2_FAILURE);
svc_impl = AXIS2_INTF_TO_IMPL(svc);
- if (NULL != svc_impl->ns_map && axis2_hash_count(svc_impl->ns_map) > 0)
+ if (svc_impl->ns_map && axis2_hash_count(svc_impl->ns_map) > 0)
{
- for (hi = axis2_hash_first(svc_impl->ns_map, env); NULL != hi;
+ for (hi = axis2_hash_first(svc_impl->ns_map, env); hi;
hi = axis2_hash_next(env, hi))
{
void * value = NULL;
@@ -2587,7 +2587,7 @@
xml_schema_t *schema1 = NULL;
schema_external = (xml_schema_external_t *)schema_obj;
schema1 = XML_SCHEMA_EXTERNAL_GET_SCHEMA(schema_external, env);
- if (NULL != schema1)
+ if (schema1)
{
axis2_char_t *name = NULL;
axis2_char_t str_count[32];
@@ -2632,7 +2632,7 @@
xml_schema_t *schema1 = NULL;
schema_external = (xml_schema_external_t *)schema_obj;
schema1 = XML_SCHEMA_EXTERNAL_GET_SCHEMA(schema_external, env);
- if (NULL != schema1)
+ if (schema1)
{
axis2_char_t *name = NULL;
axis2_char_t *value = NULL;
@@ -2640,9 +2640,9 @@
axis2_svc_adjust_schema_names(svc, env, schema1, names);
value = (axis2_char_t *) axis2_hash_get(names, schema1,
AXIS2_HASH_KEY_STRING);
- if (NULL != value)
+ if (value)
{
- if (NULL != svc_impl->custom_schema_name_prefix)
+ if (svc_impl->custom_schema_name_prefix)
{
name = axis2_strcat(env,
svc_impl->custom_schema_name_prefix, value, NULL);
@@ -2674,7 +2674,7 @@
new_table = axis2_hash_make(env);
- for (hi = axis2_hash_first(orig_table, env); NULL != env;
+ for (hi = axis2_hash_first(orig_table, env); env;
hi = axis2_hash_next(env, hi))
{
void * value = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Mon Sep 18 18:39:03 2006
@@ -245,7 +245,7 @@
AXIS2_PARAM_CHECK(env->error, conf, NULL);
svc_grp_impl = (axis2_svc_grp_impl_t *) axis2_svc_grp_create(env);
- if (NULL != svc_grp_impl)
+ if (svc_grp_impl)
svc_grp_impl->parent = conf;
return &(svc_grp_impl->svc_grp);
@@ -263,45 +263,45 @@
svc_grp_impl = AXIS2_INTF_TO_IMPL(svc_grp);
- if (NULL != svc_grp->ops)
+ if (svc_grp->ops)
{
AXIS2_FREE(env->allocator, svc_grp->ops);
svc_grp->ops = NULL;
}
- if (NULL != svc_grp->param_container)
+ if (svc_grp->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(svc_grp->param_container,
env);
svc_grp->param_container = NULL;
}
- if (NULL != svc_grp_impl->svc_grp_name)
+ if (svc_grp_impl->svc_grp_name)
{
AXIS2_FREE(env->allocator, svc_grp_impl->svc_grp_name);
svc_grp_impl->svc_grp_name = NULL;
}
- if (NULL != svc_grp_impl->svcs)
+ if (svc_grp_impl->svcs)
{
/* services are freed by arch_file_data */
axis2_hash_free(svc_grp_impl->svcs, env);
svc_grp_impl->svcs = NULL;
}
- if (NULL != svc_grp_impl->module_qnames)
+ if (svc_grp_impl->module_qnames)
{
AXIS2_ARRAY_LIST_FREE(svc_grp_impl->module_qnames, env);
svc_grp_impl->module_qnames = NULL;
}
- if (NULL != svc_grp_impl->module_list)
+ if (svc_grp_impl->module_list)
{
AXIS2_ARRAY_LIST_FREE(svc_grp_impl->module_list, env);
svc_grp_impl->module_list = NULL;
}
- if (NULL != svc_grp_impl)
+ if (svc_grp_impl)
{
AXIS2_FREE(env->allocator, svc_grp_impl);
svc_grp_impl = NULL;
@@ -540,7 +540,7 @@
ret = AXIS2_TRUE;
}
param = axis2_svc_grp_get_param(svc_grp, env, param_name);
- if (NULL != param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env))
+ if (param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env))
{
ret = AXIS2_TRUE;
}
@@ -646,13 +646,13 @@
}
module = AXIS2_CONF_GET_MODULE(svc_grp_impl->parent, env, module_name);
- if (NULL != module)
+ if (module)
{
axis2_svc_t *axis_svc = NULL;
axis2_hash_index_t *index = NULL;
index = axis2_hash_first(svc_map, env);
- while (NULL != index)
+ while (index)
{
void *v = NULL;
/* engage in per each service */
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Mon Sep 18 18:39:03 2006
@@ -229,19 +229,19 @@
transport_in_impl->recv = NULL;
}
- if (NULL != transport_in->ops)
+ if (transport_in->ops)
{
AXIS2_FREE(env->allocator, transport_in->ops);
transport_in->ops = NULL;
}
- if (NULL != transport_in->param_container)
+ if (transport_in->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(transport_in->param_container, env);
transport_in->param_container = NULL;
}
- if (NULL != transport_in_impl->qname)
+ if (transport_in_impl->qname)
{
AXIS2_QNAME_FREE(transport_in_impl->qname, env);
transport_in_impl->qname = NULL;
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Mon Sep 18 18:39:03 2006
@@ -222,19 +222,19 @@
transport_out_impl->sender = NULL;
}
- if (NULL != transport_out->ops)
+ if (transport_out->ops)
{
AXIS2_FREE(env->allocator, transport_out->ops);
transport_out->ops = NULL;
}
- if (NULL != transport_out_impl->transport_out.param_container)
+ if (transport_out_impl->transport_out.param_container)
{
AXIS2_PARAM_CONTAINER_FREE(transport_out_impl->transport_out.param_container, env);
transport_out_impl->transport_out.param_container = NULL;
}
- if (NULL != transport_out_impl->qname)
+ if (transport_out_impl->qname)
{
AXIS2_QNAME_FREE(transport_out_impl->qname, env);
transport_out_impl->qname = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Sep 18 18:39:03 2006
@@ -633,7 +633,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
config_impl = AXIS2_INTF_TO_IMPL(conf);
- if (NULL != conf->param_container)
+ if (conf->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(conf->param_container, env);
conf->param_container = NULL;
@@ -899,7 +899,7 @@
config_impl->faulty_modules = NULL;
}
- if (NULL != config_impl->dep_engine)
+ if (config_impl->dep_engine)
{
AXIS2_DEP_ENGINE_FREE(config_impl->dep_engine, env);
config_impl->dep_engine = NULL;
@@ -929,7 +929,7 @@
config_impl->axis2_repo = NULL;
}
- if (NULL != conf->ops)
+ if (conf->ops)
{
AXIS2_FREE(env->allocator, conf->ops);
conf->ops = NULL;
@@ -985,7 +985,7 @@
svc_name2 = axis2_hash_get(config_impl->all_svcs, svc_name,
AXIS2_HASH_KEY_STRING);
/* no two service names deployed in the engine can be same */
- if (NULL != svc_name2)
+ if (svc_name2)
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME, AXIS2_FAILURE);
@@ -996,7 +996,7 @@
svcs = AXIS2_SVC_GRP_GET_ALL_SVCS(svc_grp, env);
index_i = axis2_hash_first(svcs, env);
- while (NULL != index_i)
+ while (index_i)
{
void *value = NULL;
axis2_svc_t *desc = NULL;
@@ -1204,7 +1204,7 @@
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FALSE);
param = axis2_conf_get_param(conf, env, param_name);
- return (NULL != param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
+ return (param && AXIS2_TRUE == AXIS2_PARAM_IS_LOCKED(param, env));
}
axis2_transport_in_desc_t *AXIS2_CALL
@@ -1331,7 +1331,7 @@
name = AXIS2_QNAME_TO_STRING(qname, env);
ret = (axis2_module_desc_t *) axis2_hash_get(conf_impl->all_modules,
name, AXIS2_HASH_KEY_STRING);
- if (NULL != ret)
+ if (ret)
{
return ret;
}
@@ -1452,13 +1452,13 @@
config_impl = AXIS2_INTF_TO_IMPL(conf);
sgs = axis2_conf_get_all_svc_grps(conf, env);
index_i = axis2_hash_first(sgs, env);
- while (NULL != index_i)
+ while (index_i)
{
axis2_hash_this(index_i, NULL, NULL, &value);
axis_svc_grp = (axis2_svc_grp_t *) value;
svcs = AXIS2_SVC_GRP_GET_ALL_SVCS(axis_svc_grp, env);
index_j = axis2_hash_first(svcs, env);
- while (NULL != index_j)
+ while (index_j)
{
axis2_hash_this(index_j, NULL, NULL, &value2);
svc = (axis2_svc_t *) value2;
@@ -1491,7 +1491,7 @@
def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(conf, env,
AXIS2_QNAME_GET_LOCALPART(module_name, env));
- if (NULL != def_mod)
+ if (def_mod)
{
def_mod_qname = AXIS2_MODULE_DESC_GET_QNAME(def_mod, env);
}
@@ -1505,7 +1505,7 @@
engaged_modules, env, i);
if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(module_name, env, qname) ||
- (NULL != def_mod_qname && AXIS2_TRUE == AXIS2_QNAME_EQUALS(
+ (def_mod_qname && AXIS2_TRUE == AXIS2_QNAME_EQUALS(
def_mod_qname, env, qname)))
{
return AXIS2_TRUE;
@@ -1921,7 +1921,7 @@
module_desc = AXIS2_DEP_ENGINE_BUILD_MODULE(dep_engine, env, file, conf);
is_new_module = AXIS2_TRUE;
}
- if (NULL != module_desc)
+ if (module_desc)
{
int size = 0;
int i = 0;
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Mon Sep 18 18:39:03 2006
@@ -643,7 +643,7 @@
/* set msg id */
msg_uuid = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_MESSAGE_ID(fault_ctx, env, msg_uuid);
- if (NULL != msg_uuid)
+ if (msg_uuid)
{
AXIS2_FREE(env->allocator, msg_uuid);
msg_uuid = NULL;
@@ -812,7 +812,7 @@
msg_ctx);
}
else /* now we have found the paused phase and invoked the rest of the
- * handlers of that phase, invoke all the phases after that */
+ * handlers of that phase, invoke all the phases after that */
{
if (found_match)
{
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Mon Sep 18 18:39:03 2006
@@ -171,9 +171,9 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Operation found using target endpoint uri fragment");
}
- if (NULL != url_tokens[0])
+ if (url_tokens[0])
AXIS2_FREE(env->allocator, url_tokens[0]);
- if (NULL != url_tokens[1])
+ if (url_tokens[1])
AXIS2_FREE(env->allocator, url_tokens[1]);
AXIS2_FREE(env->allocator, url_tokens);
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Mon Sep 18 18:39:03 2006
@@ -126,7 +126,7 @@
phase_holder_impl = AXIS2_INTF_TO_IMPL(phase_holder);
- if (NULL != phase_holder->ops)
+ if (phase_holder->ops)
{
AXIS2_FREE(env->allocator, phase_holder->ops);
phase_holder->ops = NULL;
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Mon Sep 18 18:39:03 2006
@@ -364,7 +364,7 @@
AXIS2_QNAME_GET_LOCALPART(modulename, env));
module_desc = AXIS2_CONF_GET_MODULE(resolver_impl->axis2_config, env,
modulename);
- if (NULL != module_desc)
+ if (module_desc)
{
switch (type)
{
@@ -410,7 +410,7 @@
return AXIS2_FAILURE;
}
- if (NULL != flow)
+ if (flow)
{
int j = 0;
int count = 0;
@@ -513,7 +513,7 @@
}
}
- if (NULL != flow)
+ if (flow)
{
int j = 0;
int count = 0;
@@ -781,7 +781,7 @@
break;
}
}
- if (NULL != flow)
+ if (flow)
{
axis2_phase_holder_t *phase_holder = NULL;
int size = 0;
@@ -912,7 +912,7 @@
}
}
- if (NULL != flow)
+ if (flow)
{
axis2_phase_holder_t *phase_holder = NULL;
int hndlr_count = 0;
@@ -1246,7 +1246,7 @@
break;
}
}
- if (NULL != flow)
+ if (flow)
{
int handler_count = 0;
@@ -1403,7 +1403,7 @@
break;
}
}
- if (NULL != flow)
+ if (flow)
{
int j = 0;
for (j = 0; j < AXIS2_FLOW_GET_HANDLER_COUNT(flow, env); j++)
@@ -1609,7 +1609,7 @@
}
}
- if (NULL != flow && NULL != resolver_impl->phase_holder)
+ if (flow && NULL != resolver_impl->phase_holder)
{
int j = 0;
int handler_count = 0;
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Mon Sep 18 18:39:03 2006
@@ -162,7 +162,7 @@
recv_impl->scope = NULL;
}
- if (NULL != msg_recv->ops)
+ if (msg_recv->ops)
{
AXIS2_FREE(env->allocator, msg_recv->ops);
msg_recv->ops = NULL;
@@ -260,7 +260,7 @@
* totally removed???
*/
/*
- if(NULL != scope_param && (0 == AXIS2_STRCMP(AXIS2_SESSION_SCOPE,
+ if( scope_param && (0 == AXIS2_STRCMP(AXIS2_SESSION_SCOPE,
param_value)))
{
SessionContext sessionContext = msgContext.getSessionContext();
@@ -276,7 +276,7 @@
}
else if
*/
- if (NULL != scope_param && (0 == AXIS2_STRCMP(AXIS2_APPLICATION_SCOPE,
+ if (scope_param && (0 == AXIS2_STRCMP(AXIS2_APPLICATION_SCOPE,
param_value)))
{
struct axis2_conf_ctx *global_ctx = NULL;
@@ -375,7 +375,7 @@
{
param_value = AXIS2_PARAM_GET_VALUE(scope_param, env);
}
- if (NULL != param_value && (0 == AXIS2_STRCMP(AXIS2_APPLICATION_SCOPE,
+ if (param_value && (0 == AXIS2_STRCMP(AXIS2_APPLICATION_SCOPE,
param_value)))
{
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Mon Sep 18 18:39:03 2006
@@ -146,10 +146,10 @@
body = AXIOM_SOAP_ENVELOPE_GET_BODY(envelope, env);
op_node = AXIOM_SOAP_BODY_GET_BASE_NODE(body, env);
op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
- if (NULL != op_element)
+ if (op_element)
{
local_name = AXIOM_ELEMENT_GET_LOCALNAME(op_element, env);
- if (NULL != local_name)
+ if (local_name)
{
axis2_array_list_t *function_arr = NULL;
int i = 0;
Modified: webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c Mon Sep 18 18:39:03 2006
@@ -104,7 +104,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_callback_impl = AXIS2_INTF_TO_IMPL(svr_callback);
- if (NULL != svr_callback->ops)
+ if (svr_callback->ops)
{
AXIS2_FREE(env->allocator, svr_callback->ops);
svr_callback->ops = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c Mon Sep 18 18:39:03 2006
@@ -129,7 +129,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != chunked_stream->ops)
+ if (chunked_stream->ops)
AXIS2_FREE(env->allocator, chunked_stream->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(chunked_stream));
@@ -267,7 +267,7 @@
}
/* check whether we have extensions */
tmp = strchr(str_chunk_len, ';');
- if (NULL != tmp)
+ if (tmp)
{
/* we don't use extensions right now */
*tmp = '\0';
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_header.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_header.c Mon Sep 18 18:39:03 2006
@@ -153,17 +153,17 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
http_header_impl = AXIS2_INTF_TO_IMPL(header);
- if (NULL != http_header_impl->name)
+ if (http_header_impl->name)
{
AXIS2_FREE(env->allocator, http_header_impl->name);
http_header_impl->name = NULL;
}
- if (NULL != http_header_impl->value)
+ if (http_header_impl->value)
{
AXIS2_FREE(env->allocator, http_header_impl->value);
http_header_impl->value = NULL;
}
- if (NULL != header->ops)
+ if (header->ops)
AXIS2_FREE(env->allocator, header->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(header));
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_out_transport_info.c Mon Sep 18 18:39:03 2006
@@ -104,12 +104,12 @@
info_impl = AXIS2_INTF_TO_IMPL(info);
info_impl->response = NULL; /* response doesn't belong to info */
- if (NULL != info_impl->encoding)
+ if (info_impl->encoding)
{
AXIS2_FREE(env->allocator, info_impl->encoding);
info_impl->encoding = NULL;
}
- if (NULL != info->ops)
+ if (info->ops)
AXIS2_FREE(env->allocator, info->ops);
AXIS2_FREE(env->allocator, info_impl);
@@ -143,7 +143,7 @@
info_impl = AXIS2_INTF_TO_IMPL(info);
- if (NULL != info_impl->encoding)
+ if (info_impl->encoding)
{
tmp1 = AXIS2_STRACAT(content_type, ";charset=", env);
@@ -176,7 +176,7 @@
info_impl = AXIS2_INTF_TO_IMPL(info);
- if (NULL != info_impl->encoding)
+ if (info_impl->encoding)
{
AXIS2_FREE(env->allocator, info_impl->encoding);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c Mon Sep 18 18:39:03 2006
@@ -133,22 +133,22 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
request_line_impl = AXIS2_INTF_TO_IMPL(request_line);
- if (NULL != request_line_impl->method)
+ if (request_line_impl->method)
{
AXIS2_FREE(env->allocator, request_line_impl->method);
request_line_impl->method = NULL;
}
- if (NULL != request_line_impl->uri)
+ if (request_line_impl->uri)
{
AXIS2_FREE(env->allocator, request_line_impl->uri);
request_line_impl->uri = NULL;
}
- if (NULL != request_line_impl->http_version)
+ if (request_line_impl->http_version)
{
AXIS2_FREE(env->allocator, request_line_impl->http_version);
request_line_impl->http_version = NULL;
}
- if (NULL != request_line->ops)
+ if (request_line->ops)
AXIS2_FREE(env->allocator, request_line->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(request_line));
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_simple_request.c Mon Sep 18 18:39:03 2006
@@ -159,7 +159,7 @@
simple_request_impl->owns_stream = AXIS2_TRUE;
}
- if (http_hdr_count > 0 && NULL != http_headers)
+ if (http_hdr_count > 0 && http_headers)
{
int i = 0;
simple_request_impl->header_group = axis2_array_list_create(env,
@@ -234,12 +234,12 @@
Don't free the stream since it belongs to the socket
TODO : if chunked remove the chunked stream.
*/
- if (NULL != simple_request_impl->request_line)
+ if (simple_request_impl->request_line)
{
AXIS2_HTTP_REQUEST_LINE_FREE(simple_request_impl->request_line, env);
simple_request_impl->request_line = NULL;
}
- if (NULL != simple_request_impl->header_group)
+ if (simple_request_impl->header_group)
{
int i = 0;
axis2_http_header_t *tmp = NULL;
@@ -255,7 +255,7 @@
simple_request_impl->header_group = NULL;
}
- if (NULL != simple_request->ops)
+ if (simple_request->ops)
AXIS2_FREE(env->allocator, simple_request->ops);
AXIS2_FREE(env->allocator, simple_request_impl);
@@ -457,7 +457,7 @@
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_request_get_first_header
(simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
- if (NULL != tmp_header)
+ if (tmp_header)
return AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
return AXIS2_HTTP_HEADER_ACCEPT_TEXT_PLAIN;
@@ -473,12 +473,12 @@
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_request_get_first_header
(simple_request, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
- if (NULL != tmp_header)
+ if (tmp_header)
{
axis2_char_t *value = AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
axis2_char_t *charset = (axis2_char_t *)strstr((char *)value,
(char *)AXIS2_HTTP_CHAR_SET_ENCODING);
- if (NULL != charset)
+ if (charset)
{
charset = strchr((char *)charset, '=');
return charset;
@@ -498,7 +498,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
tmp_header = axis2_http_simple_request_get_first_header
(simple_request, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
- if (NULL != tmp_header)
+ if (tmp_header)
{
return AXIS2_ATOI(AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env));
}
@@ -549,7 +549,7 @@
while (AXIS2_STREAM_READ(body, env, tmp_buf2, 128) > 0)
{
tmp_buf3 = AXIS2_STRACAT(tmp_buf, tmp_buf2, env);
- if (NULL != tmp_buf)
+ if (tmp_buf)
{
AXIS2_FREE(env->allocator, tmp_buf);
tmp_buf = NULL;
@@ -560,7 +560,7 @@
/*
TODO :STREAM_READ => STREAM_READ_BYTES
*/
- if (NULL != tmp_buf)
+ if (tmp_buf)
{
*buf = tmp_buf;
return AXIS2_STRLEN(tmp_buf);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_simple_response.c Mon Sep 18 18:39:03 2006
@@ -169,7 +169,7 @@
return NULL;
}
simple_response_impl->status_line = status_line;
- if (http_hdr_count > 0 && NULL != http_headers)
+ if (http_hdr_count > 0 && http_headers)
{
int i = 0;
simple_response_impl->header_group = axis2_array_list_create(env,
@@ -260,12 +260,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
simple_response_impl = AXIS2_INTF_TO_IMPL(simple_response);
- if (NULL != simple_response_impl->status_line)
+ if (simple_response_impl->status_line)
{
AXIS2_HTTP_STATUS_LINE_FREE(simple_response_impl->status_line, env);
simple_response_impl->status_line = NULL;
}
- if (NULL != simple_response_impl->header_group)
+ if (simple_response_impl->header_group)
{
int i = 0;
axis2_http_header_t *tmp = NULL;
@@ -274,7 +274,7 @@
{
tmp = (axis2_http_header_t *)AXIS2_ARRAY_LIST_GET(
simple_response_impl->header_group, env, i);
- if (NULL != tmp)
+ if (tmp)
{
AXIS2_HTTP_HEADER_FREE(tmp, env);
}
@@ -282,7 +282,7 @@
AXIS2_ARRAY_LIST_FREE(simple_response_impl->header_group, env);
simple_response_impl->header_group = NULL;
}
- if (NULL != simple_response->ops)
+ if (simple_response->ops)
AXIS2_FREE(env->allocator, simple_response->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(simple_response));
@@ -314,7 +314,7 @@
AXIS2_HTTP_CRLF);
simple_response_impl = AXIS2_INTF_TO_IMPL
(simple_response);
- if (NULL != simple_response_impl->status_line)
+ if (simple_response_impl->status_line)
{
AXIS2_HTTP_STATUS_LINE_FREE(simple_response_impl->status_line, env);
simple_response_impl->status_line = NULL;
@@ -547,12 +547,12 @@
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
- if (NULL != tmp_header)
+ if (tmp_header)
{
axis2_char_t *value = AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
axis2_char_t *charset = (axis2_char_t *)strstr((char *)value,
(char *)AXIS2_HTTP_CHAR_SET_ENCODING);
- if (NULL != charset)
+ if (charset)
{
charset = strchr((char *)charset, '=');
return charset;
@@ -572,7 +572,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_LENGTH);
- if (NULL != tmp_header)
+ if (tmp_header)
{
return AXIS2_ATOI(AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env));
}
@@ -589,7 +589,7 @@
AXIS2_ENV_CHECK(env, NULL);
tmp_header = axis2_http_simple_response_get_first_header
(simple_response, env, AXIS2_HTTP_HEADER_CONTENT_TYPE);
- if (NULL != tmp_header)
+ if (tmp_header)
return AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
return AXIS2_HTTP_HEADER_ACCEPT_TEXT_PLAIN;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c Mon Sep 18 18:39:03 2006
@@ -204,27 +204,27 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
status_line_impl = AXIS2_INTF_TO_IMPL(status_line);
- if (NULL != status_line_impl->line)
+ if (status_line_impl->line)
{
AXIS2_FREE(env->allocator, status_line_impl->line);
status_line_impl->line = NULL;
}
- if (NULL != status_line_impl->http_version)
+ if (status_line_impl->http_version)
{
AXIS2_FREE(env->allocator, status_line_impl->http_version);
status_line_impl->http_version = NULL;
}
- if (NULL != status_line_impl->status_code)
+ if (status_line_impl->status_code)
{
AXIS2_FREE(env->allocator, status_line_impl->status_code);
status_line_impl->status_code = NULL;
}
- if (NULL != status_line_impl->reason_phrase)
+ if (status_line_impl->reason_phrase)
{
AXIS2_FREE(env->allocator, status_line_impl->reason_phrase);
status_line_impl->reason_phrase = NULL;
}
- if (NULL != status_line->ops)
+ if (status_line->ops)
AXIS2_FREE(env->allocator, status_line->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(status_line));
@@ -237,7 +237,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
- if (NULL != AXIS2_INTF_TO_IMPL(status_line)->status_code)
+ if (AXIS2_INTF_TO_IMPL(status_line)->status_code)
{
return AXIS2_ATOI(AXIS2_INTF_TO_IMPL(status_line)->status_code);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Mon Sep 18 18:39:03 2006
@@ -190,7 +190,7 @@
callback_ctx.unread_len = content_length;
callback_ctx.chunked_stream = NULL;
- if (NULL != soap_action_header && (strlen(soap_action_header) > 0))
+ if (soap_action_header && (strlen(soap_action_header) > 0))
{
/* remove leading and trailing " s */
if ('"' == soap_action_header[0])
@@ -210,17 +210,17 @@
headers = AXIS2_PROPERTY_GET_VALUE(property, env);
property = NULL;
}
- if (NULL != headers)
+ if (headers)
{
axis2_http_header_t *encoding_header = NULL;
encoding_header = (axis2_http_header_t *)axis2_hash_get(headers,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
AXIS2_HASH_KEY_STRING);
- if (NULL != encoding_header)
+ if (encoding_header)
{
axis2_char_t *encoding_value = NULL;
encoding_value = AXIS2_HTTP_HEADER_GET_VALUE(encoding_header, env);
- if (NULL != encoding_value && 0 == AXIS2_STRCASECMP(encoding_value,
+ if (encoding_value && 0 == AXIS2_STRCASECMP(encoding_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
callback_ctx.chunked_stream = axis2_http_chunked_stream_create(
@@ -237,7 +237,7 @@
}
}
- if (NULL != strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_MULTIPART_RELATED))
+ if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_MULTIPART_RELATED))
{
/* get mime boundry */
axis2_char_t *mime_boundary =
@@ -312,7 +312,7 @@
return AXIS2_FAILURE;
}
- if (NULL != strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP))
+ if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP))
{
is_soap11 = AXIS2_FALSE;
soap_builder = axiom_soap_builder_create(env, om_builder,
@@ -339,10 +339,10 @@
return AXIS2_FAILURE;
}
}
- else if (NULL != strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML))
+ else if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML))
{
is_soap11 = AXIS2_TRUE;
- if (NULL != soap_action_header)
+ if (soap_action_header)
{
soap_builder = axiom_soap_builder_create(env, om_builder,
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI);
@@ -371,7 +371,7 @@
/* REST support */
axis2_param_t *rest_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env
, AXIS2_ENABLE_REST);
- if (NULL != rest_param && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
+ if (rest_param && 0 == AXIS2_STRCMP(AXIS2_VALUE_TRUE,
AXIS2_PARAM_GET_VALUE(rest_param, env)))
{
/* TODO we have to check for NULLs */
@@ -410,7 +410,7 @@
* xml_reader = NULL;
* AXIOM_STAX_BUILDER_FREE(om_builder, env);
* om_builder = NULL;
- * if(NULL != soap_builder)
+ * if( soap_builder)
* {
* AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
* soap_builder = NULL;
@@ -448,7 +448,7 @@
AXIOM_SOAP12);
AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, def_envelope);
}
- if (NULL != engine)
+ if (engine)
{
AXIS2_ENGINE_FREE(engine, env);
}
@@ -499,7 +499,7 @@
return AXIS2_FALSE;
}
op = AXIS2_MSG_CTX_GET_OP(msg_ctx, env);
- if (NULL != op)
+ if (op)
{
axis2_msg_t *msg = NULL;
msg = AXIS2_OP_GET_MSG(op, env, AXIS2_MSG_IN);
@@ -560,15 +560,15 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_ENABLE_MTOM);
- if (NULL != param)
+ if (param)
value = AXIS2_PARAM_GET_VALUE(param, env);
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_ENABLE_MTOM, AXIS2_FALSE);
- if (NULL != property)
+ if (property)
value = (axis2_char_t *)AXIS2_PROPERTY_GET_VALUE(property, env);
- if (NULL != value)
+ if (value)
{
return (AXIS2_STRCMP(value, AXIS2_VALUE_TRUE) == 0);
}
@@ -637,7 +637,7 @@
axis2_http_transport_utils_strdecode(env, tmp_value, tmp_value);
tmp2 = tmp + 1;
}
- if (NULL != tmp_name && NULL != tmp_value)
+ if (tmp_name && NULL != tmp_value)
{
if (NULL == ret)
{
@@ -648,7 +648,7 @@
tmp_value = NULL;
}
}
- if (NULL != tmp_name && '\0' != *tmp2)
+ if (tmp_name && '\0' != *tmp2)
{
if (NULL == ret)
{
@@ -730,7 +730,7 @@
env);
errorneous_svc_map = AXIS2_CONF_GET_ALL_FAULTY_SVCS(AXIS2_CONF_CTX_GET_CONF(
conf_ctx, env), env);
- if (NULL != services_map && 0 != axis2_hash_count(services_map))
+ if (services_map && 0 != axis2_hash_count(services_map))
{
void *service = NULL;
axis2_char_t *sname = NULL;
@@ -738,7 +738,7 @@
svcs_exists = AXIS2_TRUE;
for (hi = axis2_hash_first(services_map, env);
- NULL != hi; hi = axis2_hash_next(env, hi))
+ hi; hi = axis2_hash_next(env, hi))
{
axis2_hash_this(hi, NULL, NULL, &service);
sname = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(
@@ -752,7 +752,7 @@
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ops = AXIS2_SVC_GET_ALL_OPS(((axis2_svc_t *)service), env);
- if (NULL != ops && 0 != axis2_hash_count(ops))
+ if (ops && 0 != axis2_hash_count(ops))
{
axis2_hash_index_t *hi2 = NULL;
void *op = NULL;
@@ -762,7 +762,7 @@
env);
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- for (hi2 = axis2_hash_first(ops, env); NULL != hi2;
+ for (hi2 = axis2_hash_first(ops, env); hi2;
hi2 = axis2_hash_next(env, hi2))
{
axis2_hash_this(hi2, NULL, NULL, &op);
@@ -791,7 +791,7 @@
}
}
}
- if (NULL != errorneous_svc_map && 0 != axis2_hash_count(errorneous_svc_map))
+ if (errorneous_svc_map && 0 != axis2_hash_count(errorneous_svc_map))
{
void *fsname = NULL;
svcs_exists = AXIS2_TRUE;
@@ -801,7 +801,7 @@
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- for (hi = axis2_hash_first(errorneous_svc_map, env); NULL != hi;
+ for (hi = axis2_hash_first(errorneous_svc_map, env); hi;
axis2_hash_next(env, hi))
{
axis2_hash_this(hi, (const void **)&fsname, NULL, NULL);
@@ -856,7 +856,7 @@
}
tmp = strchr(tmp, '=');
tmp2 = strchr(tmp, ';');
- if (NULL != tmp2)
+ if (tmp2)
{
if ('\'' == *(tmp2 - sizeof(axis2_char_t)) ||
'\"' == *(tmp2 - sizeof(axis2_char_t)))
@@ -909,7 +909,7 @@
{
return 0;
}
- if (cb_ctx->chunked_stream != NULL)
+ if (cb_ctx->chunked_stream)
{
len = AXIS2_HTTP_CHUNKED_STREAM_READ(cb_ctx->chunked_stream, env,
buffer, size);
@@ -1002,7 +1002,7 @@
content_length = AXIS2_PROPERTY_GET_VALUE(property, env);
property = NULL;
}
- if (content_length != NULL)
+ if (content_length)
{
callback_ctx->content_length = *content_length;
callback_ctx->unread_len = *content_length;
@@ -1020,7 +1020,7 @@
trans_enc = AXIS2_PROPERTY_GET_VALUE(property, env);
property = NULL;
}
- if (NULL != trans_enc && 0 == AXIS2_STRCMP(trans_enc,
+ if (trans_enc && 0 == AXIS2_STRCMP(trans_enc,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
callback_ctx->chunked_stream = axis2_http_chunked_stream_create(env,
@@ -1033,10 +1033,10 @@
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if (NULL != op_ctx)
+ if (op_ctx)
{
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
- if (NULL != ctx)
+ if (ctx)
{
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
AXIS2_CHARACTER_SET_ENCODING, AXIS2_FALSE);
@@ -1059,7 +1059,7 @@
{
char_set_enc = AXIS2_DEFAULT_CHAR_SET_ENCODING;
}
- if (NULL != content_type)
+ if (content_type)
{
axis2_char_t *mime_boundary = NULL;
AXIS2_MSG_CTX_SET_DOING_MTOM(msg_ctx, env, AXIS2_TRUE);
@@ -1222,7 +1222,7 @@
tmp = strchr(tmp, '=');
tmp2 = strchr(tmp, ';');
- if (NULL != tmp2)
+ if (tmp2)
{
*tmp2 = '\0';
}
@@ -1270,10 +1270,10 @@
AXIS2_OP_GET_QNAME(AXIS2_MSG_CTX_GET_OP(msg_ctx, env),
env), &body_child_node);
AXIOM_SOAP_BODY_ADD_CHILD(soap_body, env, body_child_node);
- if (NULL != param_map)
+ if (param_map)
{
axis2_hash_index_t *hi = NULL;
- for (hi = axis2_hash_first(param_map, env); hi != NULL;
+ for (hi = axis2_hash_first(param_map, env); hi ;
hi = axis2_hash_next(env, hi))
{
void *name = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Mon Sep 18 18:39:03 2006
@@ -134,7 +134,7 @@
AXIS2_INTF_TO_IMPL(http_worker)->conf_ctx = NULL;
- if (NULL != http_worker->ops)
+ if (http_worker->ops)
AXIS2_FREE(env->allocator, http_worker->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(http_worker));
@@ -206,12 +206,12 @@
response = axis2_http_simple_response_create_default(env);
encoding_header = AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request,
env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
- if (NULL != encoding_header)
+ if (encoding_header)
{
encoding_header_value = AXIS2_HTTP_HEADER_GET_VALUE(encoding_header,
env);
}
- if (content_length < 0 && (NULL != encoding_header_value && 0 != AXIS2_STRCMP
+ if (content_length < 0 && (encoding_header_value && 0 != AXIS2_STRCMP
(encoding_header_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED)))
{
@@ -273,7 +273,7 @@
svc_grp_uuid = axis2_uuid_gen(env);
AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_uuid);
- if (NULL != svc_grp_uuid)
+ if (svc_grp_uuid)
{
AXIS2_FREE(env->allocator, svc_grp_uuid);
svc_grp_uuid = NULL;
@@ -288,7 +288,7 @@
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
property, AXIS2_FALSE);
- if (NULL != AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env,
+ if (AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env,
AXIS2_HTTP_HEADER_SOAP_ACTION))
{
soap_action = AXIS2_HTTP_HEADER_GET_VALUE(
@@ -318,7 +318,7 @@
http_version, AXIS2_HTTP_RESPONSE_OK_CODE_VAL, "OK");
body_string = axis2_http_transport_utils_get_services_html(env,
conf_ctx);
- if (NULL != body_string)
+ if (body_string)
{
axis2_char_t str_len[10];
AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STRING(response, env,
@@ -358,7 +358,7 @@
fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
req_line = AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request
, env);
- if (NULL != req_line)
+ if (req_line)
{
sprintf(status_line_str, "%s 500 Internal Server Error\r\n",
AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(req_line,
@@ -389,11 +389,11 @@
}
}
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if (NULL != op_ctx)
+ if (op_ctx)
{
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx, env), env);
- if (NULL != ctx)
+ if (ctx)
{
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
AXIS2_RESPONSE_WRITTEN, AXIS2_FALSE);
@@ -401,7 +401,7 @@
ctx_written = AXIS2_PROPERTY_GET_VALUE(property, env);
}
}
- if (NULL != ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)
+ if (ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)
{
AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env, http_version,
AXIS2_HTTP_RESPONSE_OK_CODE_VAL, "OK");
@@ -449,7 +449,7 @@
{
conn_header = AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request,
env, AXIS2_HTTP_HEADER_CONNECTION);
- if (NULL != conn_header)
+ if (conn_header)
{
if (0 == AXIS2_STRCASECMP(AXIS2_HTTP_HEADER_GET_VALUE(conn_header,
env), AXIS2_HTTP_HEADER_CONNECTION_KEEPALIVE))
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Mon Sep 18 18:39:03 2006
@@ -172,7 +172,7 @@
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(response_writer)->encoding);
- if (NULL != response_writer->ops)
+ if (response_writer->ops)
AXIS2_FREE(env->allocator, response_writer->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(response_writer));
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Mon Sep 18 18:39:03 2006
@@ -150,14 +150,14 @@
axis2_http_server_impl_t *server_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
server_impl = AXIS2_INTF_TO_IMPL(server);
- if (NULL != server_impl->svr_thread)
+ if (server_impl->svr_thread)
{
AXIS2_HTTP_SVR_THREAD_DESTROY(server_impl->svr_thread, env);
AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
server_impl->svr_thread = NULL;
}
- if (NULL != server_impl->conf_ctx_private)
+ if (server_impl->conf_ctx_private)
{
AXIS2_CONF_CTX_FREE(server_impl->conf_ctx_private, env);
server_impl->conf_ctx_private = NULL;
@@ -167,7 +167,7 @@
*/
server_impl->conf_ctx = NULL;
- if (NULL != server->ops)
+ if (server->ops)
{
AXIS2_FREE(env->allocator, server->ops);
}
@@ -193,11 +193,11 @@
server_impl->conf_ctx = conf_ctx;
param = (axis2_param_t *)AXIS2_PARAM_CONTAINER_GET_PARAM(
in_desc->param_container, env, "port");
- if (NULL != param)
+ if (param)
{
port_str = AXIS2_PARAM_GET_VALUE(param, env);
}
- if (NULL != port_str)
+ if (port_str)
{
server_impl->port = atoi(port_str);
}
@@ -244,7 +244,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_INFO(env->log, "Terminating HTTP server thread");
- if (NULL != AXIS2_INTF_TO_IMPL(server)->svr_thread)
+ if (AXIS2_INTF_TO_IMPL(server)->svr_thread)
{
AXIS2_HTTP_SVR_THREAD_DESTROY(AXIS2_INTF_TO_IMPL(server)->svr_thread,
env);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Mon Sep 18 18:39:03 2006
@@ -163,7 +163,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
- if (NULL != svr_thread_impl->worker)
+ if (svr_thread_impl->worker)
{
AXIS2_HTTP_WORKER_FREE(svr_thread_impl->worker, env);
svr_thread_impl->worker = NULL;
@@ -174,7 +174,7 @@
svr_thread_impl->listen_socket = -1;
}
svr_thread_impl->stopped = AXIS2_TRUE;
- if (NULL != svr_thread->ops)
+ if (svr_thread->ops)
AXIS2_FREE(env->allocator, svr_thread->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(svr_thread));
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c Mon Sep 18 18:39:03 2006
@@ -186,7 +186,7 @@
AXIS2_INTF_TO_IMPL(svr_conn);
axis2_simple_http_svr_conn_close(svr_conn, env);
- if (NULL != svr_conn->ops)
+ if (svr_conn->ops)
{
AXIS2_FREE(env->allocator, svr_conn->ops);
svr_conn->ops = NULL;
@@ -315,7 +315,7 @@
break;
}
}
- if (NULL != str_line)
+ if (str_line)
{
if (0 != AXIS2_STRNCASECMP(str_line, "GET", 3) && 0 !=
AXIS2_STRNCASECMP(str_line, "POST", 4))
@@ -367,7 +367,7 @@
axis2_http_header_t *tmp_header =
axis2_http_header_create_by_str(env, str_line);
memset(str_line, 0, 1024);
- if (NULL != tmp_header)
+ if (tmp_header)
{
AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env,
tmp_header);
@@ -408,7 +408,7 @@
svr_conn_impl->stream);
content_type = (axis2_char_t *)AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(
response, env);
- if (NULL != content_type)
+ if (content_type)
{
if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_MULTIPART_RELATED)
&& strstr(content_type, AXIS2_HTTP_HEADER_XOP_XML))
@@ -420,10 +420,10 @@
}
enc_header = AXIS2_HTTP_SIMPLE_RESPONSE_GET_FIRST_HEADER(response, env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
- if (NULL != enc_header)
+ if (enc_header)
{
axis2_char_t *enc_value = AXIS2_HTTP_HEADER_GET_VALUE(enc_header, env);
- if (NULL != enc_value)
+ if (enc_value)
{
if (0 == AXIS2_STRCMP(enc_value,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
@@ -452,14 +452,14 @@
AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env, status_line);
headers = AXIS2_HTTP_SIMPLE_RESPONSE_GET_HEADERS(response, env);
- if (NULL != headers)
+ if (headers)
{
for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(headers, env); i++)
{
axis2_http_header_t *header = NULL;
header = (axis2_http_header_t *)AXIS2_ARRAY_LIST_GET(headers, env,
i);
- if (NULL != header)
+ if (header)
{
axis2_char_t *header_ext_form =
AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Mon Sep 18 18:39:03 2006
@@ -192,12 +192,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
http_client_impl = AXIS2_INTF_TO_IMPL(client);
- if (NULL != http_client_impl->url)
+ if (http_client_impl->url)
{
AXIS2_URL_FREE(http_client_impl->url, env);
http_client_impl->url = NULL;
}
- if (NULL != http_client_impl->response)
+ if (http_client_impl->response)
{
AXIS2_HTTP_SIMPLE_RESPONSE_FREE(http_client_impl->response, env);
http_client_impl->response = NULL;
@@ -207,7 +207,7 @@
axis2_network_handler_close_socket(env, http_client_impl->sockfd);
http_client_impl->sockfd = -1;
}
- if (NULL != client->ops)
+ if (client->ops)
AXIS2_FREE(env->allocator, client->ops);
AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(client));
@@ -317,7 +317,7 @@
}
headers = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
- if (NULL != headers)
+ if (headers)
{
int header_count = AXIS2_ARRAY_LIST_SIZE(headers, env);
int i = 0;
@@ -401,7 +401,7 @@
2);
body_size = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY_BYTES(request, env,
&str_body);
- if (body_size > 0 && NULL != str_body)
+ if (body_size > 0 && str_body)
{
if (AXIS2_FALSE == chunking_enabled)
{
@@ -448,7 +448,7 @@
}
client_impl->request_sent = AXIS2_TRUE;
- if (NULL != str_body)
+ if (str_body)
{
AXIS2_FREE(env->allocator, str_body);
str_body = NULL;
@@ -556,7 +556,7 @@
axis2_http_header_t *tmp_header =
axis2_http_header_create_by_str(env, str_header);
memset(str_header, 0, 512);
- if (NULL != tmp_header)
+ if (tmp_header)
{
AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(client_impl->response,
env, tmp_header);
@@ -567,7 +567,7 @@
}
AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(client_impl->response, env,
client_impl->data_stream);
- if (NULL != status_line)
+ if (status_line)
{
status_code = AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env);
AXIS2_HTTP_STATUS_LINE_FREE(status_line, env);
@@ -606,7 +606,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, url, AXIS2_FAILURE);
- if (NULL != AXIS2_INTF_TO_IMPL(client)->url)
+ if (AXIS2_INTF_TO_IMPL(client)->url)
{
AXIS2_URL_FREE(AXIS2_INTF_TO_IMPL(client)->url, env);
AXIS2_INTF_TO_IMPL(client)->url = NULL;
@@ -661,12 +661,12 @@
}
client_impl = AXIS2_INTF_TO_IMPL(client);
client_impl->proxy_port = proxy_port;
- if (NULL != client_impl->proxy_host)
+ if (client_impl->proxy_host)
{
AXIS2_FREE(env->allocator, client_impl->proxy_host);
client_impl->proxy_host = NULL;
}
- if (NULL != client_impl->proxy_host_port)
+ if (client_impl->proxy_host_port)
{
AXIS2_FREE(env->allocator, client_impl->proxy_host_port);
client_impl->proxy_host_port = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Mon Sep 18 18:39:03 2006
@@ -139,13 +139,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
transport_sender_impl = AXIS2_INTF_TO_IMPL(transport_sender);
- if (NULL != transport_sender_impl->http_version)
+ if (transport_sender_impl->http_version)
{
AXIS2_FREE(env->allocator, transport_sender_impl->http_version);
transport_sender_impl->http_version = NULL;
}
- if (NULL != transport_sender->ops)
+ if (transport_sender->ops)
AXIS2_FREE(env->allocator, transport_sender->ops);
AXIS2_FREE(env->allocator, transport_sender_impl);
@@ -188,7 +188,7 @@
if (NULL == char_set_enc)
{
axis2_op_ctx_t *op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if (NULL != op_ctx)
+ if (op_ctx)
{
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(op_ctx, env);
if (ctx)
@@ -226,14 +226,14 @@
transport_url = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(property, env);
property = NULL;
}
- if (NULL != transport_url)
+ if (transport_url)
{
epr = axis2_endpoint_ref_create(env, transport_url);
}
else
{
axis2_endpoint_ref_t *ctx_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
- if (NULL != ctx_epr && 0 != AXIS2_STRCMP(
+ if (ctx_epr && 0 != AXIS2_STRCMP(
AXIS2_WSA_ANONYMOUS_URL_SUBMISSION,
AXIS2_ENDPOINT_REF_GET_ADDRESS(ctx_epr, env)) &&
0 != AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL,
@@ -268,7 +268,7 @@
}
AXIOM_OUTPUT_SET_SOAP11(om_output, env, AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env));
- if (NULL != epr)
+ if (epr)
{
if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env)) == 0 ||
AXIS2_STRCMP(AXIS2_WSA_NONE_URL, AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env)) == 0)
@@ -430,9 +430,9 @@
om_output = NULL;
xml_writer = NULL;
- if (NULL != transport_url)
+ if (transport_url)
{
- if (NULL != epr)
+ if (epr)
{
AXIS2_ENDPOINT_REF_FREE(epr, env);
epr = NULL;
@@ -479,17 +479,17 @@
version_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
out_desc->param_container, env,
AXIS2_HTTP_PROTOCOL_VERSION);
- if (NULL != version_param)
+ if (version_param)
{
version = AXIS2_PARAM_GET_VALUE(version_param, env);
}
- if (NULL != version)
+ if (version)
{
if (0 == AXIS2_STRCMP(version, AXIS2_HTTP_HEADER_PROTOCOL_11))
{
axis2_char_t *encoding = NULL;
axis2_param_t *encoding_param = NULL;
- if (NULL != AXIS2_INTF_TO_IMPL(transport_sender)->http_version)
+ if (AXIS2_INTF_TO_IMPL(transport_sender)->http_version)
{
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
@@ -499,11 +499,11 @@
encoding_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
out_desc->param_container, env,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
- if (NULL != encoding_param)
+ if (encoding_param)
{
encoding = AXIS2_PARAM_GET_VALUE(encoding_param, env);
}
- if (NULL != encoding && 0 == AXIS2_STRCMP(encoding,
+ if (encoding && 0 == AXIS2_STRCMP(encoding,
AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
AXIS2_INTF_TO_IMPL(transport_sender)->chunked = AXIS2_TRUE;
@@ -515,7 +515,7 @@
}
else if (0 == AXIS2_STRCMP(version, AXIS2_HTTP_HEADER_PROTOCOL_10))
{
- if (NULL != AXIS2_INTF_TO_IMPL(transport_sender)->http_version)
+ if (AXIS2_INTF_TO_IMPL(transport_sender)->http_version)
{
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(transport_sender)->http_version);
@@ -536,22 +536,22 @@
temp_param = AXIS2_PARAM_CONTAINER_GET_PARAM(
out_desc->param_container, env,
AXIS2_HTTP_SO_TIMEOUT);
- if (NULL != temp_param)
+ if (temp_param)
{
temp = AXIS2_PARAM_GET_VALUE(temp_param, env);
}
- if (NULL != temp)
+ if (temp)
{
AXIS2_INTF_TO_IMPL(transport_sender)->so_timeout = AXIS2_ATOI(temp);
}
temp = (axis2_char_t *)AXIS2_PARAM_CONTAINER_GET_PARAM(
out_desc->param_container, env,
AXIS2_HTTP_CONNECTION_TIMEOUT);
- if (NULL != temp_param)
+ if (temp_param)
{
temp = AXIS2_PARAM_GET_VALUE(temp_param, env);
}
- if (NULL != temp)
+ if (temp)
{
AXIS2_INTF_TO_IMPL(transport_sender)->connection_timeout =
AXIS2_ATOI(temp);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c Mon Sep 18 18:39:03 2006
@@ -169,12 +169,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
sender_impl = AXIS2_INTF_TO_IMPL(sender);
- if (NULL != sender_impl->http_version)
+ if (sender_impl->http_version)
{
AXIS2_FREE(env->allocator, sender_impl->http_version);
sender_impl->http_version = NULL;
}
- if (NULL != sender->ops)
+ if (sender->ops)
AXIS2_FREE(env->allocator, sender->ops);
/* Do not free this here since it will be required in later processing
@@ -247,7 +247,7 @@
AXIS2_HTTP_METHOD, AXIS2_FALSE);
/* The default is POST */
- if (NULL != method && 0 == AXIS2_STRCMP(method, AXIS2_HTTP_HEADER_GET))
+ if (method && 0 == AXIS2_STRCMP(method, AXIS2_HTTP_HEADER_GET))
{
send_via_get = AXIS2_TRUE;
}
@@ -378,11 +378,11 @@
axis2_char_t *tmp_header_val = NULL;
tmp_header = AXIS2_HTTP_SIMPLE_RESPONSE_GET_FIRST_HEADER(response, env,
AXIS2_HTTP_HEADER_CONTENT_TYPE);
- if (NULL != tmp_header)
+ if (tmp_header)
{
tmp_header_val = AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
}
- if (NULL != tmp_header_val && (AXIS2_STRSTR(tmp_header_val,
+ if (tmp_header_val && (AXIS2_STRSTR(tmp_header_val,
AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP) || AXIS2_STRSTR(
tmp_header_val, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML)))
{
@@ -454,7 +454,7 @@
axis2_http_header_t *header = AXIS2_ARRAY_LIST_GET(headers, env, i);
axis2_char_t *name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
header, env);
- if (NULL != name)
+ if (name)
{
if (0 == AXIS2_STRCMP(name, AXIS2_HTTP_HEADER_TRANSFER_ENCODING) &&
0 == AXIS2_STRCMP(AXIS2_HTTP_HEADER_GET_VALUE(header
@@ -480,7 +480,7 @@
axis2_char_t *content_type = AXIS2_HTTP_HEADER_GET_VALUE(header,
env);
tmp_charset = strstr(content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
- if (NULL != charset)
+ if (charset)
{
charset = AXIS2_STRDUP(tmp_charset, env);
break;
@@ -488,11 +488,11 @@
}
}
}
- if (NULL != charset)
+ if (charset)
{
axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx, env), env);
- if (NULL != axis_ctx)
+ if (axis_ctx)
{
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -573,20 +573,20 @@
tmp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx,
env, AXIS2_HTTP_SO_TIMEOUT);
- if (NULL != tmp_param)
+ if (tmp_param)
{
so_str = (axis2_char_t*)AXIS2_PARAM_GET_VALUE(tmp_param, env);
- if (NULL != so_str)
+ if (so_str)
{
AXIS2_INTF_TO_IMPL(sender)->so_timeout = AXIS2_ATOI(so_str);
}
}
tmp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env,
AXIS2_HTTP_CONNECTION_TIMEOUT);
- if (NULL != tmp_param)
+ if (tmp_param)
{
connection_str = (axis2_char_t *)AXIS2_PARAM_GET_VALUE(tmp_param, env);
- if (NULL != connection_str)
+ if (connection_str)
{
AXIS2_INTF_TO_IMPL(sender)->connection_timeout =
AXIS2_ATOI(connection_str);
@@ -664,7 +664,7 @@
pair = AXIS2_ARRAY_LIST_GET(param_list, env, i);
tmp_string = AXIS2_STRACAT(param_string, pair, env);
- if (param_string != NULL)
+ if (param_string)
{
AXIS2_FREE(env->allocator, param_string);
param_string = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Mon Sep 18 18:39:03 2006
@@ -168,12 +168,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
sender_impl = AXIS2_INTF_TO_IMPL(sender);
- if (NULL != sender_impl->http_version)
+ if (sender_impl->http_version)
{
AXIS2_FREE(env->allocator, sender_impl->http_version);
sender_impl->http_version = NULL;
}
- if (NULL != sender->ops)
+ if (sender->ops)
AXIS2_FREE(env->allocator, sender->ops);
/* Do not free this here since it will be required in later processing
@@ -438,11 +438,11 @@
axis2_char_t *tmp_header_val = NULL;
tmp_header = AXIS2_HTTP_SIMPLE_RESPONSE_GET_FIRST_HEADER(response, env,
AXIS2_HTTP_HEADER_CONTENT_TYPE);
- if (NULL != tmp_header)
+ if (tmp_header)
{
tmp_header_val = AXIS2_HTTP_HEADER_GET_VALUE(tmp_header, env);
}
- if (NULL != tmp_header_val && (AXIS2_STRSTR(tmp_header_val,
+ if (tmp_header_val && (AXIS2_STRSTR(tmp_header_val,
AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP) || AXIS2_STRSTR(
tmp_header_val, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML)))
{
@@ -515,7 +515,7 @@
axis2_http_header_t *header = AXIS2_ARRAY_LIST_GET(headers, env, i);
axis2_char_t *name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
header, env);
- if (NULL != name)
+ if (name)
{
if (0 == AXIS2_STRCMP(name, AXIS2_HTTP_HEADER_TRANSFER_ENCODING) &&
0 == AXIS2_STRCMP(AXIS2_HTTP_HEADER_GET_VALUE(header
@@ -541,7 +541,7 @@
axis2_char_t *content_type = AXIS2_HTTP_HEADER_GET_VALUE(header,
env);
tmp_charset = strstr(content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
- if (NULL != charset)
+ if (charset)
{
charset = AXIS2_STRDUP(tmp_charset, env);
break;
@@ -551,7 +551,7 @@
}
content_type = (axis2_char_t *)AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(
response, env);
- if (NULL != content_type)
+ if (content_type)
{
if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_MULTIPART_RELATED)
&& strstr(content_type, AXIS2_HTTP_HEADER_XOP_XML))
@@ -566,11 +566,11 @@
property, AXIS2_FALSE);
}
}
- if (NULL != charset)
+ if (charset)
{
axis2_ctx_t *axis_ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx, env), env);
- if (NULL != axis_ctx)
+ if (axis_ctx)
{
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
@@ -651,20 +651,20 @@
tmp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx,
env, AXIS2_HTTP_SO_TIMEOUT);
- if (NULL != tmp_param)
+ if (tmp_param)
{
so_str = (axis2_char_t *)AXIS2_PARAM_GET_VALUE(tmp_param, env);
- if (NULL != so_str)
+ if (so_str)
{
AXIS2_INTF_TO_IMPL(sender)->so_timeout = AXIS2_ATOI(so_str);
}
}
tmp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env,
AXIS2_HTTP_CONNECTION_TIMEOUT);
- if (NULL != tmp_param)
+ if (tmp_param)
{
connection_str = (axis2_char_t *)AXIS2_PARAM_GET_VALUE(tmp_param, env);
- if (NULL != connection_str)
+ if (connection_str)
{
AXIS2_INTF_TO_IMPL(sender)->connection_timeout =
AXIS2_ATOI(connection_str);
@@ -728,10 +728,10 @@
}
proxy_param = AXIS2_PARAM_CONTAINER_GET_PARAM(trans_desc->param_container,
env, AXIS2_HTTP_PROXY);
- if (NULL != proxy_param)
+ if (proxy_param)
{
transport_attrs = AXIS2_PARAM_GET_ATTRIBUTES(proxy_param, env);
- if (NULL != transport_attrs)
+ if (transport_attrs)
{
axis2_generic_obj_t *obj = NULL;
axiom_attribute_t *host_attr = NULL;
@@ -772,7 +772,7 @@
{
return AXIS2_FAILURE;
}
- if (NULL != proxy_host && NULL != proxy_port)
+ if (proxy_host && NULL != proxy_port)
{
AXIS2_HTTP_CLIENT_SET_PROXY(sender_impl->client, env, proxy_host,
AXIS2_ATOI(proxy_port));
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c Mon Sep 18 18:39:03 2006
@@ -118,7 +118,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
- if (NULL != stream_impl->stream.ops)
+ if (stream_impl->stream.ops)
{
AXIS2_FREE(env->allocator, stream_impl->stream.ops);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c Mon Sep 18 18:39:03 2006
@@ -104,11 +104,11 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL != ssl)
+ if (ssl)
{
SSL_shutdown(ssl);
}
- if (NULL != ctx)
+ if (ctx)
{
SSL_CTX_free(ctx);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c Mon Sep 18 18:39:03 2006
@@ -108,12 +108,12 @@
info_impl = AXIS2_INTF_TO_IMPL(info);
info_impl->request = NULL; /* request doesn't belong to info */
- if (NULL != info_impl->encoding)
+ if (info_impl->encoding)
{
AXIS2_FREE(env->allocator, info_impl->encoding);
info_impl->encoding = NULL;
}
- if (NULL != info->ops)
+ if (info->ops)
AXIS2_FREE(env->allocator, info->ops);
AXIS2_FREE(env->allocator, info_impl);
@@ -147,7 +147,7 @@
info_impl = AXIS2_INTF_TO_IMPL(info);
- if (NULL != info_impl->encoding)
+ if (info_impl->encoding)
{
tmp1 = AXIS2_STRACAT(content_type, ";charset=", env);
@@ -178,7 +178,7 @@
info_impl = AXIS2_INTF_TO_IMPL(info);
- if (NULL != info_impl->encoding)
+ if (info_impl->encoding)
{
AXIS2_FREE(env->allocator, info_impl->encoding);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c Mon Sep 18 18:39:03 2006
@@ -121,7 +121,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
- if (NULL != stream_impl->stream.ops)
+ if (stream_impl->stream.ops)
{
AXIS2_FREE(env->allocator, stream_impl->stream.ops);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c Mon Sep 18 18:39:03 2006
@@ -117,13 +117,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
worker_impl = AXIS2_INTF_TO_IMPL(apache2_worker);
- if (worker_impl->conf_ctx != NULL)
+ if (worker_impl->conf_ctx)
{
AXIS2_CONF_CTX_FREE(worker_impl->conf_ctx, env);
worker_impl->conf_ctx = NULL;
}
- if (NULL != apache2_worker->ops)
+ if (apache2_worker->ops)
AXIS2_FREE(env->allocator, apache2_worker->ops);
AXIS2_FREE(env->allocator, worker_impl->conf_ctx);
@@ -291,11 +291,11 @@
if (-1 == send_status)
{
op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if (NULL != op_ctx)
+ if (op_ctx)
{
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx, env), env);
- if (NULL != ctx)
+ if (ctx)
{
property = AXIS2_CTX_GET_PROPERTY(ctx, env,
AXIS2_RESPONSE_WRITTEN, AXIS2_FALSE);
@@ -306,7 +306,7 @@
}
}
}
- if (NULL != ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)
+ if (ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)
{
send_status = OK;
body_string = axis2_apache2_worker_get_bytes(env, out_stream);
@@ -316,23 +316,23 @@
send_status = HTTP_ACCEPTED;
}
}
- if (NULL != body_string)
+ if (body_string)
{
ap_rwrite(body_string, AXIS2_STRLEN(body_string), request);
AXIS2_FREE(env->allocator, body_string);
body_string = NULL;
}
- if (NULL != url)
+ if (url)
{
AXIS2_URL_FREE(url, env);
url = NULL;
}
- if (NULL != req_url)
+ if (req_url)
{
AXIS2_FREE(env->allocator, req_url);
req_url = NULL;
}
- if (NULL != request_body)
+ if (request_body)
{
AXIS2_STREAM_FREE(request_body, env);
request_body = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c Mon Sep 18 18:39:03 2006
@@ -149,7 +149,7 @@
axis2_config_rec_t *conf = (axis2_config_rec_t*)ap_get_module_config(
cmd->server->module_config, &axis2_module);
- if (NULL != arg)
+ if (arg)
{
if (!apr_strnatcmp(arg, "AXIS2_LOG_LEVEL_DEBUG"))
{
@@ -255,7 +255,7 @@
"axis2_environment init failed\n");
status = AXIS2_FAILURE;
}
- if (NULL != axis2_logger)
+ if (axis2_logger)
{
axis2_logger->level = conf->log_level;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c Mon Sep 18 18:39:03 2006
@@ -67,11 +67,11 @@
int status)
{
axis2_allocator_t *allocator = NULL;
- if (NULL != server)
+ if (server)
{
AXIS2_TRANSPORT_RECEIVER_FREE(server, system_env);
}
- if (NULL != env)
+ if (env)
{
allocator = env->allocator;
axis2_env_free(env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org