You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/19 11:32:21 UTC
svn commit: r519895 [1/4] - in /webservices/axis2/trunk/c:
axiom/src/attachments/ axiom/src/om/ axiom/src/util/ include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engine/ modules/core/...
Author: dinesh
Date: Mon Mar 19 03:31:58 2007
New Revision: 519895
URL: http://svn.apache.org/viewvc?view=rev&rev=519895
Log:
axis2_conf.h macros, unwanted code segments removed
Modified:
webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
webservices/axis2/trunk/c/axiom/src/om/om_navigator.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/include/axis2_conf.h
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/options.c
webservices/axis2/trunk/c/modules/core/clientapi/stub.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/modules/core/description/flow_container.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c
webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
webservices/axis2/trunk/c/rampart/src/util/username_token.c
webservices/axis2/trunk/c/samples/client/math/axis2_math_stub.c
webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/test_Calcultor.c
webservices/axis2/trunk/c/samples/codegen/server/calc_xml_inout/axis2_Calculator.c
webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
webservices/axis2/trunk/c/savan/src/subscribers/savan_subscriber.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/test/core/description/test_description.c
webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/test_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/test_svc.c
webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_skel_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_skel_interop_test_port_type_doc_service.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler_options.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_c_writer.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
webservices/axis2/trunk/c/tools/codegen/src/schema/xsd2code.c
webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/file_writer.c
webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
webservices/axis2/trunk/c/tools/codegen/src/util/string.c
webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
webservices/axis2/trunk/c/tools/codegen/src/util/url_processor.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_util_test.c
webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
webservices/axis2/trunk/c/tools/tcpmon/src/session.c
webservices/axis2/trunk/c/util/src/class_loader.c
webservices/axis2/trunk/c/util/src/env.c
webservices/axis2/trunk/c/util/src/file.c
webservices/axis2/trunk/c/util/src/generic_obj.c
webservices/axis2/trunk/c/util/src/platforms/unix/uuid_gen_unix.c
webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
webservices/axis2/trunk/c/util/src/platforms/windows/uuid_gen_windows.c
webservices/axis2/trunk/c/util/src/stream.c
webservices/axis2/trunk/c/util/src/uri.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_binding_fault_exts.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_identity_constraint.c
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Mon Mar 19 03:31:58 2007
@@ -106,7 +106,7 @@
mime_output_impl = (axiom_mime_output_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axiom_mime_output_impl_t));
- if (NULL == mime_output_impl)
+ if (! mime_output_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -116,7 +116,7 @@
mime_output_impl->mime_output.ops = AXIS2_MALLOC(env->allocator,
sizeof(axiom_mime_output_ops_t));
- if (NULL == mime_output_impl->mime_output.ops)
+ if (! mime_output_impl->mime_output.ops)
{
axiom_mime_output_free(&(mime_output_impl->mime_output), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_navigator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_navigator.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_navigator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_navigator.c Mon Mar 19 03:31:58 2007
@@ -118,7 +118,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- if (NULL == om_navigator->next)
+ if (! om_navigator->next)
{
return NULL;
}
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Mon Mar 19 03:31:58 2007
@@ -1008,7 +1008,7 @@
if (AXIOM_NODE_GET_NODE_TYPE(om_node, env) == AXIOM_ELEMENT)
{
om_ele = AXIOM_NODE_GET_DATA_ELEMENT(om_node, env);
- if (NULL == om_ele)
+ if (! om_ele)
{
return NULL;
}
Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Mon Mar 19 03:31:58 2007
@@ -671,195 +671,6 @@
axis2_conf_get_param_container(const axis2_conf_t *conf,
const axis2_env_t *env);
-
-/** Frees the conf. */
-#define AXIS2_CONF_FREE(conf, env) \
- axis2_conf_free(conf, env)
-
-/** Adds a service group. */
-#define AXIS2_CONF_ADD_SVC_GRP(conf, env, svc_grp) \
- axis2_conf_add_svc_grp (conf, env, svc_grp)
-
-/** Gets the named service group. */
-#define AXIS2_CONF_GET_SVC_GRP(conf, env, svc_grp_name) \
- axis2_conf_get_svc_grp (conf, env, svc_grp_name)
-
-/** Gets all the service groups. */
-#define AXIS2_CONF_GET_ALL_SVC_GRPS(conf, env) \
- axis2_conf_get_all_svc_grps (conf, env)
-
-/** Adds a service. */
-#define AXIS2_CONF_ADD_SVC(conf, env, svc) \
- axis2_conf_add_svc (conf, env, svc)
-
-/** Gets the named service. */
-#define AXIS2_CONF_GET_SVC(conf, env, svc_name) \
- axis2_conf_get_svc (conf, env, svc_name)
-
-/** Removes the named service. */
-#define AXIS2_CONF_REMOVE_SVC(conf, env, svc_name) \
- axis2_conf_remove_svc (conf, env, svc_name)
-
-/** Adds a parameter. */
-#define AXIS2_CONF_ADD_PARAM(conf, env, param) \
- axis2_conf_add_param(conf , env, param)
-
-/** Gets the named parameter. */
-#define AXIS2_CONF_GET_PARAM(conf, env, name) \
- axis2_conf_get_param(conf , env, name)
-
-/** Gets all the parameters. */
-#define AXIS2_CONF_GET_ALL_PARAMS(conf, env) \
- axis2_conf_get_all_params(conf , env)
-
-/** Checks is the named parameter is locked. */
-#define AXIS2_CONF_IS_PARAM_LOCKED(conf, env, param_name) \
- axis2_conf_is_param_locked(conf, env, param_name)
-
-/** Gets transport in description with given QName. */
-#define AXIS2_CONF_GET_TRANSPORT_IN(conf, env, qname) \
- axis2_conf_get_transport_in(conf , env, qname)
-
-/** Adds a transport in. */
-#define AXIS2_CONF_ADD_TRANSPORT_IN(conf, env, transport, trans_enum) \
- axis2_conf_add_transport_in(conf , env, transport, trans_enum)
-
-/** Gets transport out description with given QName. */
-#define AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, qname) \
- axis2_conf_get_transport_out(conf , env, qname)
-
-/** Adds a transport out. */
-#define AXIS2_CONF_ADD_TRANSPORT_OUT(conf, env, transport, trans_enum) \
- axis2_conf_add_transport_out(conf , env, transport, trans_enum)
-
-/** Gets the named module. */
-#define AXIS2_CONF_GET_MODULE(conf, env, qname) \
- axis2_conf_get_module(conf , env, qname)
-
-/** Gets all the engaged modules. */
-#define AXIS2_CONF_GET_ALL_ENGAGED_MODULES(conf, env) \
- axis2_conf_get_all_engaged_modules(conf , env)
-
-/** Get in phases up to and including post dispatch. */
-#define AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env) \
- axis2_conf_get_in_phases_upto_and_including_post_dispatch(conf , env)
-
-/** Gets out flow. */
-#define AXIS2_CONF_GET_OUT_FLOW(conf, env) \
- axis2_conf_get_out_flow(conf , env)
-
-/** Gets in fault flow. */
-#define AXIS2_CONF_GET_IN_FAULT_FLOW(conf, env) \
- axis2_conf_get_in_fault_flow(conf , env)
-
-/** Gets out fault flow. */
-#define AXIS2_CONF_GET_OUT_FAULT_FLOW(conf, env) \
- axis2_conf_get_out_fault_flow(conf , env)
-
-/** Gets all faulty services. */
-#define AXIS2_CONF_GET_ALL_FAULTY_SVCS(conf, env) \
- axis2_conf_get_all_faulty_svcs(conf , env)
-
-/** Gets all faulty modules. */
-#define AXIS2_CONF_GET_ALL_FAULTY_MODULES(conf, env) \
- axis2_conf_get_all_faulty_modules(conf , env)
-
-/** Gets all services. */
-#define AXIS2_CONF_GET_ALL_SVCS(conf, env) \
- axis2_conf_get_all_svcs(conf , env)
-
-/** Checks if the named module is engaged. */
-#define AXIS2_CONF_IS_ENGAGED(conf, env, module_name) \
- axis2_conf_is_engaged(conf , env, module_name)
-
-/** Gets phase information. */
-#define AXIS2_CONF_GET_PHASES_INFO(conf, env) \
- axis2_conf_get_phases_info(conf , env)
-
-/** Sets phase information. */
-#define AXIS2_CONF_SET_PHASES_INFO(conf, env, phases_info) \
- axis2_conf_set_phases_info(conf , env, phases_info)
-
-/** Adds a message receiver with the given name. */
-#define AXIS2_CONF_ADD_MSG_RECV(conf, env, key, msg_recv) \
- axis2_conf_add_msg_recv(conf , env, key, msg_recv)
-
-/** Gets the message receiver with given key. */
-#define AXIS2_CONF_GET_MSG_RECV(conf, env, key) \
- axis2_conf_get_msg_recv(conf , env, key)
-
-/** Sets out phases. */
-#define AXIS2_CONF_SET_OUT_PHASES(conf, env, out_phases) \
- axis2_conf_set_out_phases(conf , env, out_phases)
-
-/** Gets out phases. */
-#define AXIS2_CONF_GET_OUT_PHASES(conf, env) \
- axis2_conf_get_out_phases(conf , env)
-
-/** Sets in fault phases. */
-#define AXIS2_CONF_SET_IN_FAULT_PHASES(conf, env, list) \
- axis2_conf_set_in_fault_phases(conf , env, list)
-
-/** Sets out fault phases. */
-#define AXIS2_CONF_SET_OUT_FAULT_PHASES(conf, env, list) \
- axis2_conf_set_out_fault_phases(conf , env, list)
-
-/** Gets all the modules. */
-#define AXIS2_CONF_GET_ALL_MODULES(conf, env) \
- axis2_conf_get_all_modules(conf , env)
-
-/** Adds a module. */
-#define AXIS2_CONF_ADD_MODULE(conf, env, module) \
- axis2_conf_add_module(conf , env, module)
-
-/** Sets the default dispatchers. */
-#define AXIS2_CONF_SET_DEFAULT_DISPATCHERS(conf, env) \
- axis2_conf_set_default_dispatchers(conf , env)
-
-/** Sets a custom dispatch phase. */
-#define AXIS2_CONF_SET_DISPATCH_PHASE(conf, env, dispatch) \
- axis2_conf_set_dispatch_phase(conf , env, dispatch)
-
-/** Gets repository location. */
-#define AXIS2_CONF_GET_REPO(conf, env) \
- axis2_conf_get_repo(conf , env)
-
-/** Sets repository location. */
-#define AXIS2_CONF_SET_REPO(conf, env, axis2_repos) \
- axis2_conf_set_repo(conf , env, axis2_repos)
-
-/** Engages a module. */
-#define AXIS2_CONF_ENGAGE_MODULE(conf, env, module_ref) \
- axis2_conf_engage_module(conf , env, module_ref)
-
-/** Sets the deployment engine. */
-#define AXIS2_CONF_SET_DEP_ENGINE(conf, env, dep_engine) \
- axis2_conf_set_dep_engine(conf, env, dep_engine)
-
-/** Gets the default module version. */
-#define AXIS2_CONF_GET_DEFAULT_MODULE_VERSION(conf, env, module_name)\
- axis2_conf_get_default_module_version(conf, env, module_name)
-
-/** Gets the default module. */
-#define AXIS2_CONF_GET_DEFAULT_MODULE(conf, env, module_name)\
- axis2_conf_get_default_module(conf, env, module_name)
-
-/** Adds the default module version for a named module. */
-#define AXIS2_CONF_ADD_DEFAULT_MODULE_VERSION(conf, env, mod_name, mod_ver)\
- axis2_conf_add_default_module_version(conf, env, mod_name, mod_ver)
-
-/** Engages a module with a given version. */
-#define AXIS2_CONF_ENGAGE_MODULE_WITH_VERSION(conf, env, mod_name, mod_ver)\
- axis2_conf_engage_module_with_version(conf, env, mod_name, mod_ver)
-
-/** Gets all the in transports. */
-#define AXIS2_CONF_GET_ALL_IN_TRANSPORTS(conf, env) \
- axis2_conf_get_all_in_transports(conf , env)
-
-/** Gets all the out transports. */
-#define AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(conf, env) \
- axis2_conf_get_all_out_transports(conf , env)
-/** @} */
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Mon Mar 19 03:31:58 2007
@@ -119,7 +119,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env, transport);
+ transport_in = axis2_conf_get_transport_in(conf, env, transport);
if (transport_in)
{
listener = axis2_transport_in_desc_get_recv(transport_in, env);
@@ -129,7 +129,7 @@
axis2_listener_manager_worker_func_args_t *arg_list = NULL;
arg_list = AXIS2_MALLOC(env->allocator,
sizeof(axis2_listener_manager_worker_func_args_t));
- if (NULL == arg_list)
+ if (! arg_list)
{
return AXIS2_FAILURE;
}
@@ -141,7 +141,7 @@
{
worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
axis2_listener_manager_worker_func, (void*)arg_list);
- if (NULL == worker_thread)
+ if (! worker_thread)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
"Invoke non blocking failed");
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar 19 03:31:58 2007
@@ -264,7 +264,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, transport_enum);
+ transport_out_desc = axis2_conf_get_transport_out(conf, env, transport_enum);
}
}
@@ -319,9 +319,9 @@
if (conf)
{
/*if it is already engaged do not engage it again*/
- if (!(AXIS2_CONF_IS_ENGAGED(conf, env, qname)))
+ if (!( axis2_conf_is_engaged(conf, env, qname)))
{
- return AXIS2_CONF_ENGAGE_MODULE(conf, env, qname);
+ return axis2_conf_engage_module(conf, env, qname);
}
}
}
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 19 03:31:58 2007
@@ -344,7 +344,7 @@
axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
+ transport_in = axis2_conf_get_transport_in(conf, env,
axis2_transport_out_desc_get_enum(transport_out, env));
}
}
@@ -428,7 +428,7 @@
axis2_op_client_worker_func_args_t *arg_list = NULL;
arg_list = AXIS2_MALLOC(env->allocator,
sizeof(axis2_op_client_worker_func_args_t));
- if (NULL == arg_list)
+ if (! arg_list)
{
return AXIS2_FAILURE;
}
@@ -442,7 +442,7 @@
{
worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
axis2_op_client_worker_func, (void*)arg_list);
- if (NULL == worker_thread)
+ if (! worker_thread)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
"call invoke non blocking");
Modified: webservices/axis2/trunk/c/modules/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/options.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Mon Mar 19 03:31:58 2007
@@ -581,7 +581,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- options->transport_out = AXIS2_CONF_GET_TRANSPORT_OUT(conf, env, sender_transport);
+ options->transport_out = axis2_conf_get_transport_out(conf, env, sender_transport);
if (!(options->transport_out))
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/stub.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/stub.c Mon Mar 19 03:31:58 2007
@@ -35,7 +35,7 @@
stub = (axis2_stub_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_stub_t));
- if (NULL == stub)
+ if (! stub)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return 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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 19 03:31:58 2007
@@ -152,7 +152,7 @@
}
svc_client->conf = axis2_conf_ctx_get_conf(svc_client->conf_ctx, env);
- repos_path = AXIS2_CONF_GET_REPO(svc_client->conf, env);
+ repos_path = axis2_conf_get_repo(svc_client->conf, env);
wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
svc_client->options = axis2_options_create(env);
@@ -173,7 +173,7 @@
op = (axis2_op_t *) v;
/* Setting operation phase */
- info = AXIS2_CONF_GET_PHASES_INFO(svc_client->conf, env);
+ info = axis2_conf_get_phases_info(svc_client->conf, env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op);
}
}
@@ -181,10 +181,10 @@
return AXIS2_FAILURE;
/** add the service to the config context if it isn't in there already */
- if (NULL == AXIS2_CONF_GET_SVC(svc_client->conf, env,
+ if (! axis2_conf_get_svc(svc_client->conf, env,
AXIS2_SVC_GET_NAME(svc_client->svc, env)))
{
- AXIS2_CONF_ADD_SVC(svc_client->conf, env, svc_client->svc);
+ axis2_conf_add_svc(svc_client->conf, env, svc_client->svc);
}
/** create a service context for myself: create a new service group
@@ -268,7 +268,7 @@
}
else
{
- if (NULL == (svc_client->svc =
+ if (! (svc_client->svc =
axis2_svc_client_create_annonymous_svc(
svc_client, env)))
{
@@ -278,10 +278,10 @@
}
/** add the service to the config context if it isn't in there already */
- if (NULL == AXIS2_CONF_GET_SVC(svc_client->conf, env,
+ if (! axis2_conf_get_svc(svc_client->conf, env,
AXIS2_SVC_GET_NAME(svc_client->svc, env)))
{
- AXIS2_CONF_ADD_SVC(svc_client->conf, env, svc_client->svc);
+ axis2_conf_add_svc(svc_client->conf, env, svc_client->svc);
}
/** create a service context for myself: create a new service group
@@ -379,7 +379,7 @@
if (mod_qname)
{
- module = AXIS2_CONF_GET_MODULE(svc_client->conf, env, mod_qname);
+ module = axis2_conf_get_module(svc_client->conf, env, mod_qname);
axis2_qname_free(mod_qname, env);
mod_qname = NULL;
@@ -409,7 +409,7 @@
mod_qname = axis2_qname_create(env, module_name, NULL, NULL);
- module = AXIS2_CONF_GET_MODULE(svc_client->conf, env, mod_qname);
+ module = axis2_conf_get_module(svc_client->conf, env, mod_qname);
/**TODO:uncomment once axis2_svc_disengage_module is implemented
if (module)
@@ -1102,7 +1102,7 @@
axis2_op_set_msg_exchange_pattern(op_robust_out_only, env, AXIS2_MEP_URI_ROBUST_OUT_ONLY);
/* Setting operation phase */
- info = AXIS2_CONF_GET_PHASES_INFO(svc_client->conf, env);
+ info = axis2_conf_get_phases_info(svc_client->conf, env);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_in);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_out_only);
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_robust_out_only);
Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Mon Mar 19 03:31:58 2007
@@ -427,7 +427,7 @@
}
if (conf_ctx->conf)
{
- AXIS2_CONF_FREE(conf_ctx->conf, env);
+ axis2_conf_free(conf_ctx->conf, env);
}
if (conf_ctx->mutex)
{
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Mon Mar 19 03:31:58 2007
@@ -372,21 +372,21 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
- msg_ctx->transport_in_desc = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
+ msg_ctx->transport_in_desc = axis2_conf_get_transport_in(conf, env,
msg_ctx->transport_in_desc_enum);
- msg_ctx->transport_out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(conf,
+ msg_ctx->transport_out_desc = axis2_conf_get_transport_out(conf,
env, msg_ctx->transport_out_desc_enum);
if (msg_ctx->svc_grp_id)
{
- msg_ctx->svc_grp = AXIS2_CONF_GET_SVC_GRP(conf, env,
+ msg_ctx->svc_grp = axis2_conf_get_svc_grp(conf, env,
msg_ctx->svc_grp_id);
}
if (msg_ctx->svc_qname)
{
- msg_ctx->svc = AXIS2_CONF_GET_SVC(conf, env,
+ msg_ctx->svc = axis2_conf_get_svc(conf, env,
axis2_qname_get_localpart(msg_ctx->svc_qname, env));
}
@@ -1133,7 +1133,7 @@
if (msg_ctx->conf_ctx)
{
axis2_conf_t *conf = axis2_conf_ctx_get_conf(msg_ctx->conf_ctx, env);
- param = AXIS2_CONF_GET_PARAM(conf, env, key);
+ param = axis2_conf_get_param(conf, env, key);
}
return param;
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Mon Mar 19 03:31:58 2007
@@ -174,7 +174,7 @@
if (svc_name)
{
- svc = AXIS2_CONF_GET_SVC(conf, env, svc_name);
+ svc = axis2_conf_get_svc(conf, env, svc_name);
if (svc)
{
Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Mon Mar 19 03:31:58 2007
@@ -136,7 +136,7 @@
if (svc_ctx->svc_qname)
{
axis2_char_t *svc_name = axis2_qname_get_localpart(svc_ctx->svc_qname, env);
- svc_ctx->svc = AXIS2_CONF_GET_SVC(conf, env, svc_name);
+ svc_ctx->svc = axis2_conf_get_svc(conf, env, svc_name);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Mon Mar 19 03:31:58 2007
@@ -160,7 +160,7 @@
if (svc_grp_ctx->svc_grp_name)
{
svc_grp_ctx->svc_grp =
- AXIS2_CONF_GET_SVC_GRP(conf, env, svc_grp_ctx->svc_grp_name);
+ axis2_conf_get_svc_grp(conf, env, svc_grp_ctx->svc_grp_name);
}
return AXIS2_SUCCESS;
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Mon Mar 19 03:31:58 2007
@@ -81,6 +81,7 @@
{
axis2_arch_file_data_t *arch_file_data = NULL;
arch_file_data = (axis2_arch_file_data_t *)
+
axis2_arch_file_data_create(env);
if (!arch_file_data)
{
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Mon Mar 19 03:31:58 2007
@@ -75,7 +75,7 @@
allocator, sizeof(axis2_conf_builder_t));
- if (NULL == conf_builder)
+ if (! conf_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -99,7 +99,7 @@
conf_builder = (axis2_conf_builder_t *) axis2_conf_builder_create(
env);
- if (NULL == conf_builder)
+ if (! conf_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -203,7 +203,7 @@
qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
mep_att = axiom_element_get_attribute(msg_recv_element, env, qmep);
att_value = axiom_attribute_get_value(mep_att, env);
- AXIS2_CONF_ADD_MSG_RECV(conf_builder->conf, env, att_value, msg_recv);
+ axis2_conf_add_msg_recv(conf_builder->conf, env, att_value, msg_recv);
axis2_qname_free(qmep, env);
}
@@ -220,7 +220,7 @@
}
else
{
- status = AXIS2_CONF_SET_DEFAULT_DISPATCHERS(conf_builder->conf, env);
+ status = axis2_conf_set_default_dispatchers(conf_builder->conf, env);
if (AXIS2_SUCCESS != status)
{
return AXIS2_FAILURE;
@@ -368,7 +368,7 @@
disp_order_element, env, qdisp, disp_order_node);
axis2_qname_free(qdisp, env);
disp_phase = axis2_phase_create(env, AXIS2_PHASE_DISPATCH);
- if (NULL == disp_phase)
+ if (! disp_phase)
{
return AXIS2_FAILURE;
}
@@ -446,7 +446,7 @@
}
else
{
- status = AXIS2_CONF_SET_DISPATCH_PHASE(conf_builder->conf, env, disp_phase);
+ status = axis2_conf_set_dispatch_phase(conf_builder->conf, env, disp_phase);
if (AXIS2_SUCCESS != status)
{
AXIS2_PHASE_FREE(disp_phase, env);
@@ -701,7 +701,7 @@
transport_out = axis2_transport_out_desc_create(env, transport_enum);
}
- if (NULL == transport_out)
+ if (! transport_out)
{
return AXIS2_FAILURE;
}
@@ -711,7 +711,7 @@
trs_dll_att = axiom_element_get_attribute(transport_element, env,
qdllname);
axis2_qname_free(qdllname, env);
- if (NULL == trs_dll_att)
+ if (! trs_dll_att)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_TRANSPORT_SENDER_ERROR,
AXIS2_FAILURE);
@@ -842,7 +842,7 @@
}
/* adding to axis config */
- status = AXIS2_CONF_ADD_TRANSPORT_OUT(conf_builder->conf, env,
+ status = axis2_conf_add_transport_out(conf_builder->conf, env,
transport_out, transport_enum);
if (AXIS2_SUCCESS != status)
{
@@ -1083,7 +1083,7 @@
}
/* adding to axis config */
- status = AXIS2_CONF_ADD_TRANSPORT_IN(conf_builder->conf, env,
+ status = axis2_conf_add_transport_in(conf_builder->conf, env,
transport_in, transport_enum);
if (AXIS2_SUCCESS != status)
{
@@ -1116,12 +1116,12 @@
om_element = (axiom_element_t *)
axiom_children_qname_iterator_next(module_versions, env);
- if (NULL == om_element)
+ if (! om_element)
{
continue;
}
attribute_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
- if (NULL == attribute_qname)
+ if (! attribute_qname)
{
continue;
}
@@ -1129,13 +1129,13 @@
attribute_qname);
axis2_qname_free(attribute_qname, env);
attribute_qname = NULL;
- if (NULL == name)
+ if (! name)
{
return AXIS2_FAILURE;
}
attribute_qname = axis2_qname_create(env,
AXIS2_ATTRIBUTE_DEFAULT_VERSION, NULL, NULL);
- if (NULL == attribute_qname)
+ if (! attribute_qname)
{
continue;
}
@@ -1143,11 +1143,11 @@
attribute_qname);
axis2_qname_free(attribute_qname, env);
attribute_qname = NULL;
- if (NULL == default_version)
+ if (! default_version)
{
return AXIS2_FAILURE;
}
- AXIS2_CONF_ADD_DEFAULT_MODULE_VERSION(
+ axis2_conf_add_default_module_version(
conf_builder->conf, env, name,
default_version);
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Mon Mar 19 03:31:58 2007
@@ -57,7 +57,7 @@
{
return NULL;
}
- AXIS2_CONF_SET_DEP_ENGINE(conf, env, dep_engine);
+ axis2_conf_set_dep_engine(conf, env, dep_engine);
phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
if (!phase_resolver)
@@ -100,7 +100,7 @@
{
return NULL;
}
- AXIS2_CONF_SET_DEP_ENGINE(conf, env, dep_engine);
+ axis2_conf_set_dep_engine(conf, env, dep_engine);
phase_resolver = axis2_phase_resolver_create_with_config(env, conf);
if (!phase_resolver)
@@ -138,7 +138,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_hash_t *module_map = AXIS2_CONF_GET_ALL_MODULES(conf, env);
+ axis2_hash_t *module_map = axis2_conf_get_all_modules(conf, env);
if (module_map)
{
axis2_hash_index_t *hi = NULL;
@@ -183,7 +183,7 @@
axis2_transport_out_desc_t **transport_out_map = NULL;
int i = 0;
- transport_in_map = AXIS2_CONF_GET_ALL_IN_TRANSPORTS(conf, env);
+ transport_in_map = axis2_conf_get_all_in_transports(conf, env);
for (i = 0; i < AXIS2_TRANSPORT_ENUM_MAX; i++)
{
if (transport_in_map[i])
@@ -197,7 +197,7 @@
}
}
- transport_out_map = AXIS2_CONF_GET_ALL_OUT_TRANSPORTS(conf, env);
+ transport_out_map = axis2_conf_get_all_out_transports(conf, env);
for (i = 0; i < AXIS2_TRANSPORT_ENUM_MAX; i++)
{
if (transport_out_map[i])
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Mar 19 03:31:58 2007
@@ -133,7 +133,7 @@
dep_engine = (axis2_dep_engine_t *) AXIS2_MALLOC(env->allocator
, sizeof(axis2_dep_engine_t));
- if (NULL == dep_engine)
+ if (! dep_engine)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -211,7 +211,7 @@
dep_engine = (axis2_dep_engine_t *) axis2_dep_engine_create(env);
- if (NULL == dep_engine)
+ if (! dep_engine)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -227,7 +227,7 @@
}
dep_engine->folder_name = axis2_strdup(repos_path, env);
- if (NULL == dep_engine->folder_name)
+ if (! dep_engine->folder_name)
{
axis2_dep_engine_free(dep_engine, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -235,7 +235,7 @@
}
dep_engine->axis2_repos = axis2_strdup(repos_path, env);
- if (NULL == dep_engine->axis2_repos)
+ if (! dep_engine->axis2_repos)
{
axis2_dep_engine_free(dep_engine, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -409,7 +409,7 @@
{
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
- return AXIS2_CONF_GET_MODULE(dep_engine->conf, env, module_name);
+ return axis2_conf_get_module(dep_engine->conf, env, module_name);
}
AXIS2_EXTERN struct axis2_arch_file_data *AXIS2_CALL
@@ -481,9 +481,9 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- para_hot_dep = AXIS2_CONF_GET_PARAM(dep_engine->conf, env,
+ para_hot_dep = axis2_conf_get_param(dep_engine->conf, env,
AXIS2_HOTDEPLOYMENT);
- para_hot_update = AXIS2_CONF_GET_PARAM(dep_engine->conf, env,
+ para_hot_update = axis2_conf_get_param(dep_engine->conf, env,
AXIS2_HOTUPDATE);
if (para_hot_dep)
@@ -515,7 +515,7 @@
axis2_array_list_t *new_out_fault_phases = NULL;
AXIS2_ENV_CHECK(env, NULL);
- if (NULL == dep_engine->conf_name)
+ if (! dep_engine->conf_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_PATH_TO_CONFIG_CAN_NOT_BE_NULL,
AXIS2_FAILURE);
@@ -533,13 +533,13 @@
dep_engine->conf_name, dep_engine, dep_engine->conf);
if (!(dep_engine->conf_builder))
{
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
}
status = AXIS2_CONF_BUILDER_POPULATE_CONF(dep_engine->conf_builder, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
return NULL;
}
@@ -566,35 +566,35 @@
dep_engine->folder_name, dep_engine);
if (!dep_engine->repos_listener)
{
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
return NULL;
}
- AXIS2_CONF_SET_REPO(dep_engine->conf, env, dep_engine->axis2_repos);
+ axis2_conf_set_repo(dep_engine->conf, env, dep_engine->axis2_repos);
axis2_core_utils_calculate_default_module_version(env,
- AXIS2_CONF_GET_ALL_MODULES(dep_engine->conf, env),
+ axis2_conf_get_all_modules(dep_engine->conf, env),
dep_engine->conf);
status = axis2_dep_engine_validate_system_predefined_phases(dep_engine, env);
if (AXIS2_SUCCESS != status)
{
AXIS2_REPOS_LISTENER_FREE(dep_engine->repos_listener, env);
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
AXIS2_FAILURE);
return NULL;
}
- status = AXIS2_CONF_SET_PHASES_INFO(dep_engine->conf, env,
+ status = axis2_conf_set_phases_info(dep_engine->conf, env,
dep_engine->phases_info);
out_fault_phases = AXIS2_PHASES_INFO_GET_OP_OUT_FAULTPHASES(
dep_engine->phases_info, env);
new_out_fault_phases = axis2_phases_info_copy_flow(env, out_fault_phases);
if (out_fault_phases)
axis2_array_list_free(out_fault_phases, env);
- AXIS2_CONF_SET_OUT_FAULT_PHASES(dep_engine->conf, env, new_out_fault_phases);
+ axis2_conf_set_out_fault_phases(dep_engine->conf, env, new_out_fault_phases);
if (AXIS2_SUCCESS != status)
{
AXIS2_REPOS_LISTENER_FREE(dep_engine->repos_listener, env);
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
return NULL;
}
@@ -602,7 +602,7 @@
if (AXIS2_SUCCESS != status)
{
AXIS2_REPOS_LISTENER_FREE(dep_engine->repos_listener, env);
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
AXIS2_FAILURE);
return NULL;
@@ -659,13 +659,13 @@
dep_engine->conf_name, dep_engine, dep_engine->conf);
if (!(dep_engine->conf_builder))
{
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
}
status = AXIS2_CONF_BUILDER_POPULATE_CONF(dep_engine->conf_builder, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
dep_engine->conf = NULL;
return NULL;
}
@@ -683,17 +683,17 @@
dep_engine->folder_name, dep_engine);
}
- AXIS2_CONF_SET_REPO(dep_engine->conf, env, dep_engine->axis2_repos);
+ axis2_conf_set_repo(dep_engine->conf, env, dep_engine->axis2_repos);
axis2_core_utils_calculate_default_module_version(env,
- AXIS2_CONF_GET_ALL_MODULES(dep_engine->conf, env),
+ axis2_conf_get_all_modules(dep_engine->conf, env),
dep_engine->conf);
- AXIS2_CONF_SET_PHASES_INFO(dep_engine->conf, env, dep_engine->
+ axis2_conf_set_phases_info(dep_engine->conf, env, dep_engine->
phases_info);
status = axis2_dep_engine_engage_modules(dep_engine, env);
if (AXIS2_FAILURE == status)
{
AXIS2_REPOS_LISTENER_FREE(dep_engine->repos_listener, env);
- AXIS2_CONF_FREE(dep_engine->conf, env);
+ axis2_conf_free(dep_engine->conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_VALIDATION_FAILED,
AXIS2_FAILURE);
return NULL;
@@ -767,7 +767,7 @@
dep_engine->module_list, env, i);
if (qname && dep_engine->conf)
{
- status = AXIS2_CONF_ENGAGE_MODULE(dep_engine->conf, env, qname);
+ status = axis2_conf_engage_module(dep_engine->conf, env, qname);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -859,7 +859,7 @@
qmodulename = (axis2_qname_t *) axis2_array_list_get(grp_modules,
env, j);
- module_desc = AXIS2_CONF_GET_MODULE(dep_engine->conf, env,
+ module_desc = axis2_conf_get_module(dep_engine->conf, env,
qmodulename);
if (module_desc)
{
@@ -886,7 +886,7 @@
qmodulename = (axis2_qname_t *) axis2_array_list_get(list,
env, j);
- module_desc = AXIS2_CONF_GET_MODULE(dep_engine->conf, env,
+ module_desc = axis2_conf_get_module(dep_engine->conf, env,
qmodulename);
if (module_desc)
{
@@ -929,7 +929,7 @@
module_qname = (axis2_qname_t *) axis2_array_list_get(modules,
env, k);
- module = AXIS2_CONF_GET_MODULE(dep_engine->conf, env,
+ module = axis2_conf_get_module(dep_engine->conf, env,
module_qname);
if (module)
@@ -947,7 +947,7 @@
}
axis2_svc_grp_add_svc(svc_metadata, env, svc);
}
- return AXIS2_CONF_ADD_SVC_GRP(dep_engine->conf, env, svc_metadata);
+ return axis2_conf_add_svc_grp(dep_engine->conf, env, svc_metadata);
}
static axis2_status_t
@@ -1176,7 +1176,7 @@
module->handler_create_func_map);
}
- AXIS2_CONF_ADD_MODULE(dep_engine->conf, env,
+ axis2_conf_add_module(dep_engine->conf, env,
module_metadata);
return AXIS2_SUCCESS;
@@ -1314,9 +1314,9 @@
svc_name = axis2_dep_engine_get_axis_svc_name(dep_engine, env,
file_name);
- AXIS2_CONF_REMOVE_SVC(dep_engine->conf, env, svc_name);
+ axis2_conf_remove_svc(dep_engine->conf, env, svc_name);
}
- faulty_svcs = AXIS2_CONF_GET_ALL_FAULTY_SVCS(dep_engine->conf, env);
+ faulty_svcs = axis2_conf_get_all_faulty_svcs(dep_engine->conf, env);
axis2_hash_set(faulty_svcs, svc_name, AXIS2_HASH_KEY_STRING, NULL);
}
@@ -1431,7 +1431,7 @@
AXIS2_PARAM_CHECK(env->error, module_archive, NULL);
AXIS2_PARAM_CHECK(env->error, conf, NULL);
- phases_info = AXIS2_CONF_GET_PHASES_INFO(conf, env);
+ phases_info = axis2_conf_get_phases_info(conf, env);
axis2_dep_engine_set_phases_info(dep_engine, env, phases_info);
dep_engine->curr_file = axis2_arch_file_data_create_with_type_and_file(
env, AXIS2_MODULE, module_archive);
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Mon Mar 19 03:31:58 2007
@@ -51,7 +51,7 @@
allocator, sizeof(axis2_desc_builder_t));
- if (NULL == desc_builder)
+ if (! desc_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -77,7 +77,7 @@
desc_builder = (axis2_desc_builder_t *)
axis2_desc_builder_create(env);
- if (NULL == desc_builder)
+ if (! desc_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -106,7 +106,7 @@
desc_builder = (axis2_desc_builder_t *)
axis2_desc_builder_create(env);
- if (NULL == desc_builder)
+ if (! desc_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -325,7 +325,7 @@
if (class_qname)
axis2_qname_free(class_qname, env);
- if (NULL == class_attrib)
+ if (! class_attrib)
{
axis2_handler_desc_free(handler_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
@@ -351,7 +351,7 @@
if (order_qname)
axis2_qname_free(order_qname, env);
- if (NULL == order_element || NULL == order_node)
+ if (! order_element || ! order_node)
{
axis2_handler_desc_free(handler_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
@@ -848,7 +848,7 @@
ref_qname = axis2_qname_create(env, ref_name, NULL, NULL);
module_desc = AXIS2_DEP_ENGINE_GET_MODULE(desc_builder->engine, env,
ref_qname);
- if (NULL == module_desc)
+ if (! module_desc)
{
axis2_qname_free(ref_qname, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
@@ -904,7 +904,7 @@
{
return NULL;
}
- impl_info_param = AXIS2_CONF_GET_PARAM(conf, env, class_name);
+ impl_info_param = axis2_conf_get_param(conf, env, class_name);
if (!impl_info_param)
{
@@ -929,7 +929,7 @@
/* set the impl_info_param(which contain dll_desc as value) so that
* loaded msg_recv loader lib can be re-used in future
*/
- AXIS2_CONF_ADD_PARAM(conf, env, impl_info_param);
+ axis2_conf_add_param(conf, env, impl_info_param);
}
axis2_class_loader_init(env);
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Mon Mar 19 03:31:58 2007
@@ -42,7 +42,7 @@
allocator, sizeof(axis2_module_builder_t));
- if (NULL == module_builder)
+ if (! module_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -63,7 +63,7 @@
AXIS2_ENV_CHECK(env, NULL);
module_builder = (axis2_module_builder_t *) axis2_module_builder_create(env);
- if (NULL == module_builder)
+ if (! module_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -404,7 +404,7 @@
if (qattname)
axis2_qname_free(qattname, env);
- if (NULL == op_name_att)
+ if (! op_name_att)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_OP_NAME_MISSING,
AXIS2_FAILURE);
@@ -419,7 +419,7 @@
{
mep_url = axiom_attribute_get_value(op_mep_att, env);
}
- if (NULL == mep_url)
+ if (! mep_url)
{
/* Assuming in-out mep */
op_desc = axis2_op_create_from_module(env);
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Mon Mar 19 03:31:58 2007
@@ -40,7 +40,7 @@
phases_info = (axis2_phases_info_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_phases_info_t));
- if (NULL == phases_info)
+ if (! phases_info)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -621,7 +621,7 @@
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
op_in_phases = axis2_phases_info_get_op_in_phases(phases_info, env);
- if (NULL == op_in_phases)
+ if (! op_in_phases)
{
status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
/* op_in_phases cannot be NULL */
@@ -629,7 +629,7 @@
}
op_out_phases = axis2_phases_info_get_op_out_phases(phases_info, env);
- if (NULL == op_out_phases)
+ if (! op_out_phases)
{
status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
/* op_out_phases cannot be 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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Mon Mar 19 03:31:58 2007
@@ -51,7 +51,7 @@
repos_listener = (axis2_repos_listener_t *) AXIS2_MALLOC(env->allocator
, sizeof(axis2_repos_listener_t));
- if (NULL == repos_listener)
+ if (! repos_listener)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -85,7 +85,7 @@
repos_listener = (axis2_repos_listener_t *) axis2_repos_listener_create(env);
- if (NULL == repos_listener)
+ if (! repos_listener)
{
return 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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Mon Mar 19 03:31:58 2007
@@ -44,7 +44,7 @@
allocator, sizeof(axis2_svc_builder_t));
- if (NULL == svc_builder)
+ if (! svc_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -70,7 +70,7 @@
AXIS2_PARAM_CHECK(env->error, dep_engine, NULL);
AXIS2_PARAM_CHECK(env->error, svc, NULL);
svc_builder = (axis2_svc_builder_t *) axis2_svc_builder_create(env);
- if (NULL == svc_builder)
+ if (! svc_builder)
{
return NULL;
}
@@ -98,7 +98,7 @@
AXIS2_PARAM_CHECK(env->error, dep_engine, NULL);
AXIS2_PARAM_CHECK(env->error, svc, NULL);
svc_builder = (axis2_svc_builder_t *) axis2_svc_builder_create(env);
- if (NULL == svc_builder)
+ if (! svc_builder)
{
return NULL;
}
@@ -472,7 +472,7 @@
op_name_att = axiom_element_get_attribute(op_element, env, qattname);
axis2_qname_free(qattname, env);
qattname = NULL;
- if (NULL == op_name_att)
+ if (! op_name_att)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_OP_NAME_MISSING,
AXIS2_FAILURE);
@@ -495,9 +495,9 @@
op_name = axiom_attribute_get_value(op_name_att, env);
qopname = axis2_qname_create(env, op_name, NULL, NULL);
/*wsdl_op = AXIS2_SVC_GET_WSDL_OP(svc_builder->svc, env, qopname);*/
- /*if (NULL == wsdl_op)
+ /*if (! wsdl_op)
{*/
- /*if (NULL == mep_url)
+ /*if (! mep_url)
{*/
/* assumed MEP is in-out */
op_desc = axis2_op_create(env);
@@ -518,7 +518,7 @@
/* Creating operation from existing operation */
/* mep = AXIS2_WSDL_OP_GET_MSG_EXCHANGE_PATTERN(wsdl_op, env);
- if (NULL == mep)
+ if (! mep)
{
op_desc = axis2_op_create_with_wsdl_op(env, wsdl_op);
}
@@ -619,7 +619,7 @@
env, qattname);
axis2_qname_free(qattname, env);
qattname = NULL;
- if (NULL == module_name_att)
+ if (! module_name_att)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODULE_CONF,
AXIS2_FAILURE);
@@ -661,7 +661,7 @@
ref_name = axiom_attribute_get_value(module_ref_att, env);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
- if (NULL == AXIS2_DEP_ENGINE_GET_MODULE(
+ if (! AXIS2_DEP_ENGINE_GET_MODULE(
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env),
env, qrefname))
{
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Mon Mar 19 03:31:58 2007
@@ -35,7 +35,7 @@
allocator, sizeof(axis2_svc_grp_builder_t));
- if (NULL == svc_grp_builder)
+ if (! svc_grp_builder)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -172,7 +172,7 @@
}
svc_name = axiom_attribute_get_value(svc_name_att, env);
- if (NULL == svc_name)
+ if (! svc_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_NAME_ERROR,
AXIS2_FAILURE);
@@ -189,7 +189,7 @@
axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env),
env);
axis_svc = axis2_arch_file_data_get_svc(file_data, env, svc_name);
- if (NULL == axis_svc)
+ if (! axis_svc)
{
axis2_qname_t *qsvc_name = NULL;
@@ -252,7 +252,7 @@
module = AXIS2_DEP_ENGINE_GET_MODULE(
axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env),
env, qrefname);
- if (NULL == module)
+ if (! module)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Mon Mar 19 03:31:58 2007
@@ -43,7 +43,7 @@
allocator, sizeof(axis2_ws_info_t));
- if (NULL == ws_info)
+ if (! ws_info)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return 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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Mon Mar 19 03:31:58 2007
@@ -50,7 +50,7 @@
allocator, sizeof(axis2_ws_info_list_t));
- if (NULL == ws_info_list)
+ if (! ws_info_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return 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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow_container.c Mon Mar 19 03:31:58 2007
@@ -37,7 +37,7 @@
allocator, sizeof(axis2_flow_container_t));
- if (NULL == flow_container)
+ if (! flow_container)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Mon Mar 19 03:31:58 2007
@@ -50,7 +50,7 @@
module_desc = (axis2_module_desc_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_module_desc_t));
- if (NULL == module_desc)
+ if (! module_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -64,7 +64,7 @@
module_desc->ops = NULL;
module_desc->params = axis2_param_container_create(env);
- if (NULL == module_desc->params)
+ if (! module_desc->params)
{
axis2_module_desc_free(module_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -72,7 +72,7 @@
}
module_desc->flow_container = axis2_flow_container_create(env);
- if (NULL == module_desc->flow_container)
+ if (! module_desc->flow_container)
{
axis2_module_desc_free(module_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
@@ -80,7 +80,7 @@
}
module_desc->ops = axis2_hash_make(env);
- if (NULL == module_desc->ops)
+ if (! module_desc->ops)
{
axis2_module_desc_free(module_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -99,7 +99,7 @@
AXIS2_PARAM_CHECK(env->error, qname, NULL);
module_desc = axis2_module_desc_create(env);
- if (NULL == module_desc)
+ if (! module_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -288,7 +288,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
- if (NULL == (module_desc->ops))
+ if (! (module_desc->ops))
{
module_desc->ops = axis2_hash_make(env);
if (!module_desc->ops)
@@ -297,7 +297,7 @@
op_qname = axis2_op_get_qname(op, env);
- if (NULL == op_qname)
+ if (! op_qname)
{
return AXIS2_FAILURE;
}
@@ -344,7 +344,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
param_name_l = axis2_param_get_name(param, env);
- if (NULL == param_name_l)
+ if (! param_name_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
AXIS2_FAILURE);
@@ -394,12 +394,12 @@
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
/* checking the locked value of parent*/
- if (NULL == module_desc->parent)
+ if (! module_desc->parent)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_MODULE_DESC, AXIS2_FAILURE);
return AXIS2_FALSE;
}
- locked = AXIS2_CONF_IS_PARAM_LOCKED(module_desc->parent, env, param_name);
+ locked = axis2_conf_is_param_locked(module_desc->parent, env, param_name);
if (AXIS2_TRUE == locked)
{
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Mon Mar 19 03:31:58 2007
@@ -102,7 +102,7 @@
svc = (axis2_svc_t *)
AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_t));
- if (NULL == svc)
+ if (! svc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -135,7 +135,7 @@
svc->style = NULL;
svc->param_container = axis2_param_container_create(env);
- if (NULL == svc->param_container)
+ if (! svc->param_container)
{
axis2_svc_free(svc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -143,7 +143,7 @@
}
svc->flow_container = axis2_flow_container_create(env);
- if (NULL == svc->flow_container)
+ if (! svc->flow_container)
{
axis2_svc_free(svc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -151,7 +151,7 @@
}
svc->op_alias_map = axis2_hash_make(env);
- if (NULL == svc->op_alias_map)
+ if (! svc->op_alias_map)
{
axis2_svc_free(svc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -160,7 +160,7 @@
/** create module list of default size */
svc->op_action_map = axis2_hash_make(env);
- if (NULL == svc->op_action_map)
+ if (! svc->op_action_map)
{
axis2_svc_free(svc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -168,7 +168,7 @@
}
svc->module_list = axis2_array_list_create(env, 0);
- if (NULL == svc->module_list)
+ if (! svc->module_list)
{
axis2_svc_free(svc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -177,7 +177,7 @@
svc->schema_list = axis2_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
- if (NULL == svc->schema_list)
+ if (! svc->schema_list)
{
axis2_svc_free(svc, env);
return NULL;
@@ -185,7 +185,7 @@
svc->engaged_modules = axis2_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
- if (NULL == svc->engaged_modules)
+ if (! svc->engaged_modules)
{
axis2_svc_free(svc, env);
return NULL;
@@ -228,7 +228,7 @@
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
svc = axis2_svc_create(env);
- if (NULL == svc)
+ if (! svc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -471,7 +471,7 @@
key = axis2_qname_get_localpart(op_qname, env);
op = axis2_hash_get(svc->op_alias_map, key, AXIS2_HASH_KEY_STRING);
- if (NULL == op)
+ if (! op)
op = axis2_hash_get(svc->op_action_map, key, AXIS2_HASH_KEY_STRING);
return op;
@@ -1106,7 +1106,7 @@
wsdl_endpoint = axis2_svc_get_endpoint(svc, env, endpoint);
wsdl_binding = AXIS2_WSDL_ENDPOINT_GET_BINDING(wsdl_endpoint, env);
binding_ops = AXIS2_WSDL_BINDING_GET_BINDING_OPS(wsdl_binding, env);
- if (NULL == binding_ops)
+ if (! binding_ops)
{
return NULL;
}
@@ -1439,7 +1439,7 @@
svc->custom_schema_name_prefix = NULL;
}
svc->custom_schema_name_prefix = axis2_strdup(prefix, env);
- if (NULL == svc->custom_schema_name_prefix)
+ if (! svc->custom_schema_name_prefix)
{
return AXIS2_FAILURE;
}
@@ -1470,7 +1470,7 @@
svc->custom_schema_name_suffix = NULL;
}
svc->custom_schema_name_suffix = axis2_strdup(suffix, env);
- if (NULL == svc->custom_schema_name_suffix)
+ if (! svc->custom_schema_name_suffix)
{
return AXIS2_FAILURE;
}
@@ -1487,7 +1487,7 @@
int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL == svc->schema_list)
+ if (! svc->schema_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_EMPTY_SCHEMA_LIST,
AXIS2_FAILURE);
@@ -1532,7 +1532,7 @@
AXIS2_ENV_CHECK(env, NULL);
- if (NULL == svc->schema_list)
+ if (! svc->schema_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_EMPTY_SCHEMA_LIST,
AXIS2_FAILURE);
@@ -1540,7 +1540,7 @@
}
schema = (xml_schema_t *)axis2_array_list_get(svc->schema_list, env, index);
prefix_map = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(schema, env);
- if (NULL == prefix_map)
+ if (! prefix_map)
{
return NULL;
}
@@ -1576,7 +1576,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, schema, AXIS2_FAILURE);
- if (NULL == svc->schema_list)
+ if (! svc->schema_list)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_EMPTY_SCHEMA_LIST,
AXIS2_FAILURE);
@@ -1817,7 +1817,7 @@
}
}
}
- if (NULL == svc->ns_map)
+ if (! svc->ns_map)
{
svc->ns_map = axis2_hash_make(env);
svc->ns_map = NULL;
@@ -1847,7 +1847,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
schemas = axis2_svc_get_all_schemas(svc, env);
- if (NULL == schemas)
+ if (! schemas)
{
return AXIS2_FAILURE;
}
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Mon Mar 19 03:31:58 2007
@@ -43,7 +43,7 @@
svc_grp = (axis2_svc_grp_t *)
AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_grp_t));
- if (NULL == svc_grp)
+ if (! svc_grp)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -327,7 +327,7 @@
param = axis2_param_container_get_param(svc_grp->param_container, env, name);
if (param == NULL && svc_grp->parent)
{
- param = AXIS2_CONF_GET_PARAM(svc_grp->parent, env, name);
+ param = axis2_conf_get_param(svc_grp->parent, env, name);
}
return param;
}
@@ -360,7 +360,7 @@
/* checking the locked value of parent */
if (parent)
{
- locked = AXIS2_CONF_IS_PARAM_LOCKED(parent, env, param_name);
+ locked = axis2_conf_is_param_locked(parent, env, param_name);
}
if (AXIS2_TRUE == locked)
{
@@ -408,7 +408,7 @@
AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
if (svc_grp->parent)
- AXIS2_CONF_FREE(svc_grp->parent, env);
+ axis2_conf_free(svc_grp->parent, env);
svc_grp->parent = parent;
return AXIS2_SUCCESS;
}
@@ -465,7 +465,7 @@
return AXIS2_FAILURE;
}
- module = AXIS2_CONF_GET_MODULE(svc_grp->parent, env, module_name);
+ module = axis2_conf_get_module(svc_grp->parent, env, module_name);
if (module)
{
axis2_svc_t *axis_svc = NULL;
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Mon Mar 19 03:31:58 2007
@@ -45,7 +45,7 @@
transport_in = (axis2_transport_in_desc_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_transport_in_desc_t));
- if (NULL == transport_in)
+ if (! transport_in)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -60,7 +60,7 @@
transport_in->param_container = NULL;
transport_in->param_container = axis2_param_container_create(env);
- if (NULL == transport_in->param_container)
+ if (! transport_in->param_container)
{
axis2_transport_in_desc_free(transport_in, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Mon Mar 19 03:31:58 2007
@@ -40,7 +40,7 @@
transport_out = (axis2_transport_out_desc_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_transport_out_desc_t));
- if (NULL == transport_out)
+ if (! transport_out)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -55,7 +55,7 @@
transport_out->param_container = NULL;
transport_out->param_container = axis2_param_container_create(env);
- if (NULL == transport_out->param_container)
+ if (! transport_out->param_container)
{
axis2_transport_out_desc_free(transport_out, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar 19 03:31:58 2007
@@ -130,7 +130,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- svc = AXIS2_CONF_GET_SVC(conf, env, url_tokens[0]);
+ svc = axis2_conf_get_svc(conf, env, url_tokens[0]);
if (svc)
{
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=519895&r1=519894&r2=519895
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 19 03:31:58 2007
@@ -71,7 +71,7 @@
conf = (axis2_conf_t *) AXIS2_MALLOC(env->allocator
, sizeof(axis2_conf_t));
- if (NULL == conf)
+ if (! conf)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -99,7 +99,7 @@
conf->param_container = (axis2_param_container_t *)
axis2_param_container_create(env);
- if (NULL == conf->param_container)
+ if (! conf->param_container)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -107,7 +107,7 @@
}
conf->svc_grps = axis2_hash_make(env);
- if (NULL == conf->svc_grps)
+ if (! conf->svc_grps)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -125,7 +125,7 @@
}
conf->engaged_modules = axis2_array_list_create(env, 0);
- if (NULL == conf->engaged_modules)
+ if (! conf->engaged_modules)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -133,7 +133,7 @@
}
conf->handlers = axis2_array_list_create(env, 0);
- if (NULL == conf->handlers)
+ if (! conf->handlers)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -142,7 +142,7 @@
conf->in_phases_upto_and_including_post_dispatch =
axis2_array_list_create(env, 0);
- if (NULL == conf->in_phases_upto_and_including_post_dispatch)
+ if (! conf->in_phases_upto_and_including_post_dispatch)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -153,7 +153,7 @@
axis2_disp_t *uri_dispatch = NULL;
phase = axis2_phase_create(env, AXIS2_PHASE_TRANSPORT_IN);
- if (NULL == phase)
+ if (! phase)
{
axis2_conf_free(conf, env);
return NULL;
@@ -181,7 +181,7 @@
}
phase = axis2_phase_create(env, AXIS2_PHASE_PRE_DISPATCH);
- if (NULL == phase)
+ if (! phase)
{
axis2_conf_free(conf, env);
return NULL;
@@ -198,7 +198,7 @@
conf->all_svcs = axis2_hash_make(env);
- if (NULL == conf->all_svcs)
+ if (! conf->all_svcs)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -206,7 +206,7 @@
}
conf->msg_recvs = axis2_hash_make(env);
- if (NULL == conf->msg_recvs)
+ if (! conf->msg_recvs)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -214,7 +214,7 @@
}
conf->faulty_svcs = axis2_hash_make(env);
- if (NULL == conf->faulty_svcs)
+ if (! conf->faulty_svcs)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -222,7 +222,7 @@
}
conf->faulty_modules = axis2_hash_make(env);
- if (NULL == conf->faulty_modules)
+ if (! conf->faulty_modules)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -230,7 +230,7 @@
}
conf->all_modules = axis2_hash_make(env);
- if (NULL == conf->all_modules)
+ if (! conf->all_modules)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -238,7 +238,7 @@
}
conf->name_to_version_map = axis2_hash_make(env);
- if (NULL == conf->name_to_version_map)
+ if (! conf->name_to_version_map)
{
axis2_conf_free(conf, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -597,14 +597,14 @@
svc_grp = axis2_svc_grp_create(env);
- if (NULL == svc_grp)
+ if (! svc_grp)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)
return AXIS2_FAILURE;
}
svc_grp_qname = AXIS2_SVC_GET_QNAME(svc, env);
- if (NULL == svc_grp_qname)
+ if (! svc_grp_qname)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_SVC,
AXIS2_FAILURE);
@@ -698,7 +698,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
- if (NULL == conf->param_container)
+ if (! conf->param_container)
{
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER, AXIS2_FAILURE);
@@ -814,13 +814,13 @@
return ret;
}
module_name = axis2_qname_get_localpart(qname, env);
- if (NULL == module_name)
+ if (! module_name)
{
return NULL;
}
- def_mod_ver = AXIS2_CONF_GET_DEFAULT_MODULE_VERSION(conf, env, module_name);
+ def_mod_ver = axis2_conf_get_default_module_version(conf, env, module_name);
mod_qname = axis2_core_utils_get_module_qname(env, name, def_mod_ver);
- if (NULL == mod_qname)
+ if (! mod_qname)
{
return NULL;
}
@@ -950,7 +950,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FALSE);
- def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(conf, env,
+ def_mod = axis2_conf_get_default_module(conf, env,
axis2_qname_get_localpart(module_name, env));
if (def_mod)
{
@@ -1144,7 +1144,6 @@
axis2_phase_t *dispatch = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_disp_t *add_dispatch = NULL;
- /*axis2_disp_t *uri_dispatch = NULL;*/
axis2_disp_t *soap_action_based_dispatch = NULL;
axis2_disp_t *soap_msg_body_based_dispatch = NULL;
axis2_handler_t *handler = NULL;
@@ -1184,18 +1183,6 @@
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
- /*uri_dispatch = axis2_req_uri_disp_create(env);
- if (!uri_dispatch)
- {
- return AXIS2_FAILURE;
- }
-
- handler = axis2_disp_get_base(uri_dispatch, env);
- axis2_disp_free(uri_dispatch, env);
- AXIS2_PHASE_ADD_HANDLER_AT(dispatch, env, 1, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- handler = NULL;*/
-
soap_action_based_dispatch = axiom_soap_action_disp_create(env);
if (!soap_action_based_dispatch)
{
@@ -1217,7 +1204,7 @@
}
post_dispatch = axis2_phase_create(env, AXIS2_PHASE_POST_DISPATCH);
- if (NULL == post_dispatch)
+ if (! post_dispatch)
{
AXIS2_PHASE_FREE(dispatch, env);
return AXIS2_FAILURE;
@@ -1228,7 +1215,6 @@
axis2_disp_checker_free(disp_checker, env);
AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 0, handler);
axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- handler = NULL;
handler = axis2_ctx_handler_create(env, NULL);
AXIS2_PHASE_ADD_HANDLER_AT(post_dispatch, env, 1, handler);
@@ -1267,7 +1253,7 @@
}
post_dispatch = axis2_phase_create(env, AXIS2_PHASE_POST_DISPATCH);
- if (NULL == post_dispatch)
+ if (! post_dispatch)
{
AXIS2_PHASE_FREE(dispatch, env);
return AXIS2_FAILURE;
@@ -1313,7 +1299,7 @@
AXIS2_PARAM_CHECK(env->error, module_ref, AXIS2_FAILURE);
module_desc = axis2_conf_get_module(conf, env, module_ref);
- if (NULL == module_desc)
+ if (! module_desc)
{
axis2_file_t *file = NULL;
axis2_char_t *file_name = NULL;
@@ -1333,7 +1319,7 @@
file_name = axis2_qname_get_localpart(module_ref, env);
file = (axis2_file_t *) axis2_arch_reader_create_module_arch(
arch_reader, env, file_name) ;
- repos_path = AXIS2_CONF_GET_REPO(conf, env);
+ repos_path = axis2_conf_get_repo(conf, env);
temp_path1 = axis2_stracat(repos_path, AXIS2_PATH_SEP_STR, env);
temp_path2 = axis2_stracat(temp_path1, AXIS2_MODULE_FOLDER, env);
temp_path3 = axis2_stracat(temp_path2, AXIS2_PATH_SEP_STR, env);
@@ -1453,7 +1439,7 @@
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
def_ver_map = conf->name_to_version_map;
- if (NULL == def_ver_map)
+ if (! def_ver_map)
{
return NULL;
}
@@ -1476,9 +1462,9 @@
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
all_modules = conf->all_modules;
- mod_ver = AXIS2_CONF_GET_DEFAULT_MODULE_VERSION(conf, env, module_name);
+ mod_ver = axis2_conf_get_default_module_version(conf, env, module_name);
- if (NULL == mod_ver)
+ if (!mod_ver)
{
mod_name = axis2_strdup(module_name, env);
}
@@ -1493,7 +1479,7 @@
AXIS2_FREE(env->allocator, mod_name);
mod_name = NULL;
- if (NULL == mod_qname)
+ if (!mod_qname)
{
return NULL;
}
@@ -1523,11 +1509,11 @@
*/
name_to_ver_map = conf->name_to_version_map;
- if (NULL == axis2_hash_get(name_to_ver_map, module_name,
+ if (!axis2_hash_get(name_to_ver_map, module_name,
AXIS2_HASH_KEY_STRING))
{
axis2_char_t *new_entry = axis2_strdup(module_version, env);
- if (NULL == new_entry)
+ if (! new_entry)
{
return AXIS2_FAILURE;
}
@@ -1553,11 +1539,11 @@
module_qname = axis2_core_utils_get_module_qname(env, module_name,
version_id);
- if (NULL == module_qname)
+ if (!module_qname)
{
return AXIS2_FAILURE;
}
- status = AXIS2_CONF_ENGAGE_MODULE(conf, env, module_qname);
+ status = axis2_conf_engage_module(conf, env, module_qname);
axis2_qname_free(module_qname, env);
return status;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org