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 da...@apache.org on 2006/02/10 06:07:07 UTC

svn commit: r376556 [1/3] - in /webservices/axis2/trunk/c/modules: core/addr/ core/clientapi/ core/context/ core/deployment/ core/description/ core/engine/ core/phaseresolver/ core/receivers/ core/transport/http/receiver/ core/transport/http/sender/ ut...

Author: damitha
Date: Thu Feb  9 21:07:02 2006
New Revision: 376556

URL: http://svn.apache.org/viewcvs?rev=376556&view=rev
Log:
replaced AXIS2_FUNC_PARAM_CHECK with ENV_CHECK

Modified:
    webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
    webservices/axis2/trunk/c/modules/core/clientapi/call.c
    webservices/axis2/trunk/c/modules/core/clientapi/mep_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/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/arch_reader.c
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.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/op.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/ctx_handler.c
    webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/event.c
    webservices/axis2/trunk/c/modules/core/engine/handler.c
    webservices/axis2/trunk/c/modules/core/engine/phase.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/engine/soap_action_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/transport/http/receiver/http_response_writer.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
    webservices/axis2/trunk/c/modules/util/linked_list.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_binding.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_binding_fault.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_endpoint.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_extensible_element.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_fault_ref.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_feature.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_msg_ref.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_property.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_soap_op.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c

Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Thu Feb  9 21:07:02 2006
@@ -145,7 +145,7 @@
 axis2_char_t* AXIS2_CALL axis2_endpoint_ref_get_address(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->address;
 }
 
@@ -157,7 +157,7 @@
 axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_address(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env, axis2_char_t *address) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->address = address;
     return AXIS2_SUCCESS;
 }
@@ -168,7 +168,7 @@
 axis2_qname_t* AXIS2_CALL axis2_endpoint_ref_get_interface_qname(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname;
 }
 
@@ -180,7 +180,7 @@
 axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_interface_qname(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env, axis2_qname_t *interface_qname) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname = interface_qname;
     return AXIS2_SUCCESS;
 }
@@ -191,7 +191,7 @@
 axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_properties(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_properties;
 }
 
@@ -203,7 +203,7 @@
 axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_properties(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env, axis2_any_content_type_t *ref_properties) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_properties = ref_properties;
     return AXIS2_SUCCESS;    
 }
@@ -214,7 +214,7 @@
 axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_params(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params;
 }
 
@@ -222,7 +222,7 @@
                                                     axis2_env_t **env,
                                                     axis2_any_content_type_t* any_content_type)
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params = any_content_type;
     return AXIS2_SUCCESS;
 }
@@ -233,7 +233,7 @@
 axis2_svc_name_t* AXIS2_CALL axis2_endpoint_ref_get_svc_name(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->svc_name;
 }
 
@@ -245,7 +245,7 @@
 axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_svc_name(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env, axis2_svc_name_t *svc_name) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->svc_name = svc_name;
     return AXIS2_SUCCESS;
 }
@@ -253,14 +253,14 @@
 axis2_om_node_t* AXIS2_CALL axis2_endpoint_ref_get_policies(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->policies;
 }
 
 axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_policies(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env, axis2_om_node_t *policies) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->policies = policies;
     return AXIS2_SUCCESS;
 }
@@ -268,14 +268,14 @@
 axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_metadata(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(endpoint_ref)->metadata;
 }
 
 axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_metadata(struct axis2_endpoint_ref *endpoint_ref, 
                                                axis2_env_t **env, axis2_any_content_type_t *metadata) 
 {
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(endpoint_ref)->metadata = metadata;
     return AXIS2_SUCCESS;
 }
@@ -285,7 +285,7 @@
 {
     axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     endpoint_ref_impl = AXIS2_INTF_TO_IMPL(endpoint_ref);
     
@@ -304,7 +304,7 @@
 {
     axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(endpoint_ref, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     endpoint_ref_impl = AXIS2_INTF_TO_IMPL(endpoint_ref);
     

Modified: webservices/axis2/trunk/c/modules/core/clientapi/call.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/call.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/call.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/call.c Thu Feb  9 21:07:02 2006
@@ -250,7 +250,7 @@
 {
     axis2_call_impl_t *call_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -329,7 +329,7 @@
     axis2_char_t *message_id = "uuid:"; /* TODO UUIDGenerator.getUUID()*/
     
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     svc = AXIS2_SVC_CTX_GET_SVC(call_impl->svc_ctx, env);
@@ -460,7 +460,7 @@
     axis2_engine_t *engine = NULL;
     axis2_char_t *message_id =NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -552,7 +552,7 @@
     axis2_env_t **env,
     axis2_endpoint_ref_t *to) 
 {
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(call)->to = to;
     return AXIS2_SUCCESS;
 }
@@ -583,7 +583,7 @@
     axis2_conf_t *conf = NULL;
     axis2_qname_t *qname = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -672,7 +672,7 @@
 {
     axis2_call_impl_t *call_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -726,7 +726,7 @@
     axis2_char_t *transport_name = NULL;
     axis2_qname_t *transport_qname = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -798,7 +798,7 @@
     axis2_env_t **env,
     long timeout_ms) 
 {
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(call)->timeout_ms = timeout_ms;
     return AXIS2_SUCCESS;
 }
@@ -819,7 +819,7 @@
     axis2_svc_t *svc = NULL;
     axis2_op_t *op = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
 
@@ -893,7 +893,7 @@
     axis2_msg_ctx_t *msg_ctx = NULL;
     axis2_conf_ctx_t *conf_ctx = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
 
@@ -960,7 +960,7 @@
     axis2_op_t *op = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
 
@@ -1014,7 +1014,7 @@
     axis2_op_t *op = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -1073,7 +1073,7 @@
     axis2_qname_t *op_qname = NULL;
     axis2_op_t *op = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     call_impl = AXIS2_INTF_TO_IMPL(call);
     
@@ -1150,7 +1150,7 @@
 axis2_msg_ctx_t* AXIS2_CALL axis2_call_get_last_res_msg_ctx(struct axis2_call *call, 
     axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(call, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(call)->last_res_msg_ctx;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Thu Feb  9 21:07:02 2006
@@ -129,7 +129,7 @@
 
 axis2_char_t* AXIS2_CALL axis2_mep_client_get_soap_action(struct axis2_mep_client *mep_client, axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(mep_client)->soap_action;
 }
 
@@ -138,7 +138,7 @@
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     axis2_svc_t *svc = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
     
@@ -193,7 +193,7 @@
     axis2_msg_ctx_t *msg_ctx = NULL;
     axis2_soap_envelope_t *envelope = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
@@ -235,7 +235,7 @@
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     axis2_char_t *transport = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
@@ -282,7 +282,7 @@
     axis2_soap_envelope_t *envelope = NULL;
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
     if (AXIS2_STRCMP(AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, mep_client_impl->soap_version_uri) == 0) 
@@ -311,7 +311,7 @@
     axis2_conf_ctx_t *conf_ctx = NULL;
     axis2_conf_t *conf = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
@@ -339,7 +339,7 @@
 {
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
@@ -366,7 +366,7 @@
 {
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
@@ -393,7 +393,7 @@
 {
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     
@@ -447,7 +447,7 @@
 
 axis2_svc_ctx_t* AXIS2_CALL axis2_mep_client_get_svc_ctx(struct axis2_mep_client *mep_client, axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(mep_client)->svc_ctx;
 }
 
@@ -456,7 +456,7 @@
 {
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(mep_client, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     mep_client_impl = AXIS2_INTF_TO_IMPL(mep_client);
     

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Thu Feb  9 21:07:02 2006
@@ -179,39 +179,39 @@
 
 axis2_status_t AXIS2_CALL axis2_conf_ctx_set_conf(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env, axis2_conf_t *conf) 
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(conf_ctx)->conf = conf; /* we just maitain a shalow copy here */
     return AXIS2_SUCCESS;
 }
 
 axis2_ctx_t* AXIS2_CALL axis2_conf_ctx_get_base(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->base;
 }
 
 axis2_conf_t* AXIS2_CALL axis2_conf_ctx_get_conf(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->conf;
 }
 
 axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_op_ctx_map(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->op_ctx_map;
 }
 
 axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_svc_ctx_map(struct axis2_conf_ctx *conf_ctx, axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->svc_ctx_map;
 }
 
 axis2_hash_t* AXIS2_CALL axis2_conf_ctx_get_svc_grp_ctx_map(struct axis2_conf_ctx *conf_ctx, 
                                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(conf_ctx)->svc_grp_ctx_map;
 }
 
@@ -222,7 +222,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -240,7 +240,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -258,7 +258,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -276,7 +276,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -294,7 +294,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -312,7 +312,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -326,7 +326,7 @@
 axis2_char_t* AXIS2_CALL axis2_conf_ctx_get_root_dir(struct axis2_conf_ctx *conf_ctx, 
                                                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);    
+    AXIS2_ENV_CHECK(env, NULL);    
     return AXIS2_INTF_TO_IMPL(conf_ctx)->root_dir;
 }
 
@@ -336,7 +336,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -367,7 +367,7 @@
     axis2_hash_index_t *hi = NULL;
     void* ctx = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
 
@@ -414,7 +414,7 @@
 {
     axis2_conf_ctx_impl_t *conf_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     
@@ -468,7 +468,7 @@
     axis2_op_ctx_t *op_ctx = NULL;
 
     
-    AXIS2_FUNC_PARAM_CHECK(conf_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     conf_ctx_impl = AXIS2_INTF_TO_IMPL(conf_ctx);
     

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Thu Feb  9 21:07:02 2006
@@ -575,7 +575,7 @@
 struct axis2_ctx* AXIS2_CALL axis2_msg_ctx_get_base(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->base;
 }
 
@@ -583,14 +583,14 @@
 struct axis2_op_ctx * AXIS2_CALL axis2_msg_ctx_get_parent(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->parent;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_parent(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, struct axis2_op_ctx *parent) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (parent)
     {
@@ -606,7 +606,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
 
@@ -679,7 +679,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, conf, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
@@ -721,7 +721,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
 
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
 
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
 
@@ -739,7 +739,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
 
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
 
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
 
@@ -754,14 +754,14 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_in_fault_flow(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->in_fault_flow;
 }
 
 axis2_soap_envelope_t* AXIS2_CALL axis2_msg_ctx_get_soap_envelope(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->soap_envelope;
 }
 
@@ -770,7 +770,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -785,7 +785,7 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_process_fault(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->process_fault;
 }
 
@@ -794,7 +794,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -812,7 +812,7 @@
 {
         axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -827,14 +827,14 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_response_written(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->response_written;
 }
 
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_server_side(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->server_side;
 }
 
@@ -843,7 +843,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -861,7 +861,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
 
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
 
@@ -878,7 +878,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -895,7 +895,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_in_fault_flow(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t in_fault_flow) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->in_fault_flow = in_fault_flow;
     return  AXIS2_SUCCESS;
 }
@@ -903,7 +903,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_envelope(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_soap_envelope_t *soap_envelope) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (soap_envelope)
     {
@@ -942,7 +942,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -959,7 +959,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_process_fault(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t process_fault) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->process_fault  = process_fault;
     return  AXIS2_SUCCESS;
 }
@@ -969,7 +969,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -988,7 +988,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1004,7 +1004,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_response_written(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t response_written ) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->response_written  = response_written ;
     return  AXIS2_SUCCESS;
 }
@@ -1012,7 +1012,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_server_side(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t server_side) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->server_side = server_side;
     return  AXIS2_SUCCESS;
 }
@@ -1022,7 +1022,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1038,14 +1038,14 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_new_thread_required(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->new_thread_required;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_new_thread_required(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t new_thread_required) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->new_thread_required = new_thread_required;
     return AXIS2_SUCCESS;
 }
@@ -1055,7 +1055,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1073,7 +1073,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1091,7 +1091,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1109,7 +1109,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
 
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
 
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
 
@@ -1126,21 +1126,21 @@
 axis2_msg_info_headers_t *AXIS2_CALL axis2_msg_ctx_get_msg_info_headers(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->msg_info_headers;
 }
 
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_paused(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->paused;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_paused(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t paused) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->paused = paused;
     return AXIS2_SUCCESS;
 }
@@ -1148,21 +1148,21 @@
 struct axis2_transport_in_desc * AXIS2_CALL axis2_msg_ctx_get_transport_in_desc(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->transport_in_desc;
 }
 
 struct axis2_transport_out_desc * AXIS2_CALL axis2_msg_ctx_get_transport_out_desc(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->transport_out_desc;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_transport_in_desc(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, struct axis2_transport_in_desc *transport_in_desc)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (transport_in_desc)
     {
@@ -1176,7 +1176,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_transport_out_desc(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, struct axis2_transport_out_desc *transport_out_desc) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (transport_out_desc)
     {
@@ -1190,7 +1190,7 @@
 struct axis2_op_ctx * AXIS2_CALL axis2_msg_ctx_get_op_ctx(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->op_ctx;
 }
 
@@ -1199,7 +1199,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1223,7 +1223,7 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_output_written(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->output_written;
 }
 
@@ -1231,7 +1231,7 @@
                                                 axis2_env_t **env,
                                                 axis2_bool_t output_written) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->output_written = output_written;
     return AXIS2_SUCCESS;
 }
@@ -1239,7 +1239,7 @@
 axis2_char_t *AXIS2_CALL axis2_msg_ctx_get_svc_ctx_id(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->svc_ctx_id;
 }
 
@@ -1249,7 +1249,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1274,14 +1274,14 @@
 struct axis2_conf_ctx *AXIS2_CALL axis2_msg_ctx_get_conf_ctx(struct axis2_msg_ctx *msg_ctx, 
                                                     axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->conf_ctx;
 }
 
 struct axis2_svc_ctx *AXIS2_CALL axis2_msg_ctx_get_svc_ctx(struct axis2_msg_ctx *msg_ctx, 
                                                     axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->svc_ctx;
 }
 
@@ -1289,7 +1289,7 @@
                                                     axis2_env_t **env,
                                                     struct axis2_conf_ctx *conf_ctx) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (conf_ctx)
     {
@@ -1305,7 +1305,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
 
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1328,7 +1328,7 @@
                                                 axis2_env_t **env, 
                                                 axis2_msg_info_headers_t *msg_info_headers) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (msg_info_headers)
     {
@@ -1345,7 +1345,7 @@
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     axis2_param_t *param = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1398,7 +1398,7 @@
     axis2_qname_t *qname = NULL;
     axis2_conf_t *conf = NULL;*/
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     /*AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
@@ -1525,7 +1525,7 @@
     void *obj = NULL;
     axis2_ctx_t *ctx = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1597,7 +1597,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1607,14 +1607,14 @@
 axis2_qname_t *AXIS2_CALL axis2_msg_ctx_get_paused_handler_name(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->paused_handler_name;
 }
 
 axis2_char_t * AXIS2_CALL axis2_msg_ctx_get_paused_phase_name(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->paused_phase_name;
 }
 
@@ -1623,7 +1623,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1648,7 +1648,7 @@
 axis2_char_t* AXIS2_CALL axis2_msg_ctx_get_soap_action(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->soap_action;
 }
 
@@ -1658,7 +1658,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1683,7 +1683,7 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_doing_mtom(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->doing_mtom;
 }
 
@@ -1691,7 +1691,7 @@
                                         axis2_env_t **env,
                                         axis2_bool_t doing_mtom) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->doing_mtom = doing_mtom;
     return AXIS2_SUCCESS;
 }
@@ -1699,14 +1699,14 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_doing_rest(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->doing_rest;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_doing_rest(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t doing_rest) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->doing_rest = doing_rest;
     return AXIS2_SUCCESS;
 }
@@ -1714,7 +1714,7 @@
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_do_rest_through_post(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_bool_t do_rest_through_post) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(msg_ctx)->do_rest_through_post = do_rest_through_post;
     return AXIS2_SUCCESS;
 }
@@ -1722,28 +1722,28 @@
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_do_rest_through_post(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->do_rest_through_post;
 }
 
 axis2_bool_t AXIS2_CALL axis2_msg_ctx_get_is_soap_11(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->is_soap_11;
 }
 
 struct axis2_svc_grp_ctx *AXIS2_CALL axis2_msg_ctx_get_svc_grp_ctx(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->svc_grp_ctx;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_svc_grp_ctx(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, struct axis2_svc_grp_ctx *svc_grp_ctx) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (svc_grp_ctx)
     {
@@ -1756,14 +1756,14 @@
 axis2_op_t *AXIS2_CALL axis2_msg_ctx_get_op(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->op;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_op(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_op_t *op) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (op)
     {
@@ -1777,14 +1777,14 @@
 axis2_svc_t *AXIS2_CALL axis2_msg_ctx_get_svc(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->svc;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_svc(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_svc_t *svc) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (svc)
     {
@@ -1806,14 +1806,14 @@
 axis2_svc_grp_t * AXIS2_CALL axis2_msg_ctx_get_svc_grp(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->svc_grp;
 }
 
 axis2_status_t AXIS2_CALL axis2_msg_ctx_set_svc_grp(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env, axis2_svc_grp_t *svc_grp) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     if (svc_grp)
     {
@@ -1827,7 +1827,7 @@
 axis2_char_t * AXIS2_CALL axis2_msg_ctx_get_svc_grp_ctx_id(struct axis2_msg_ctx *msg_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, NULL);    
+    AXIS2_ENV_CHECK(env, NULL);    
     return AXIS2_INTF_TO_IMPL(msg_ctx)->svc_grp_ctx_id;
 }
 
@@ -1837,7 +1837,7 @@
 {
     axis2_msg_ctx_impl_t *msg_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     msg_ctx_impl = AXIS2_INTF_TO_IMPL(msg_ctx);
     
@@ -1863,7 +1863,7 @@
 axis2_msg_ctx_is_paused(axis2_msg_ctx_t *msg_ctx,
                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(msg_ctx, env, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     return AXIS2_INTF_TO_IMPL(msg_ctx)->paused;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Thu Feb  9 21:07:02 2006
@@ -126,14 +126,14 @@
 axis2_ctx_t* AXIS2_CALL axis2_svc_ctx_get_base(struct axis2_svc_ctx *svc_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->base;
 }
 
 
 struct axis2_svc_grp_ctx * AXIS2_CALL axis2_svc_ctx_get_parent(struct axis2_svc_ctx *svc_ctx, axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->parent;
 }
 
@@ -144,7 +144,7 @@
 {
     axis2_svc_ctx_impl_t *svc_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     svc_ctx_impl = AXIS2_INTF_TO_IMPL(svc_ctx);
     
@@ -176,7 +176,7 @@
 {
     axis2_svc_ctx_impl_t *svc_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     svc_ctx_impl = AXIS2_INTF_TO_IMPL(svc_ctx);
 
@@ -195,7 +195,7 @@
 axis2_char_t* AXIS2_CALL axis2_svc_ctx_get_svc_id(struct axis2_svc_ctx *svc_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->svc_id;
 }
 
@@ -203,14 +203,14 @@
 axis2_svc_t* AXIS2_CALL axis2_svc_ctx_get_svc(struct axis2_svc_ctx *svc_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_ctx)->svc;
 }
 
 struct axis2_conf_ctx* AXIS2_CALL axis2_svc_ctx_get_conf_ctx(struct axis2_svc_ctx *svc_ctx, 
                                             axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_SVC_GRP_CTX_GET_PARENT(AXIS2_INTF_TO_IMPL(svc_ctx)->parent, env);
 }
 
@@ -220,7 +220,7 @@
     axis2_svc_ctx_impl_t *svc_ctx_impl = NULL;
     axis2_op_t *op = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     svc_ctx_impl = AXIS2_INTF_TO_IMPL(svc_ctx);
     

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Thu Feb  9 21:07:02 2006
@@ -144,14 +144,14 @@
 axis2_ctx_t* AXIS2_CALL axis2_svc_grp_ctx_get_base(struct axis2_svc_grp_ctx *svc_grp_ctx, 
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->base;
 }
 
 
 struct axis2_conf_ctx* AXIS2_CALL axis2_svc_grp_ctx_get_parent(struct axis2_svc_grp_ctx *svc_grp_ctx, axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->parent;
 }
 
@@ -162,7 +162,7 @@
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     svc_grp_ctx_impl = AXIS2_INTF_TO_IMPL(svc_grp_ctx);
     
@@ -200,7 +200,7 @@
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     svc_grp_ctx_impl = AXIS2_INTF_TO_IMPL(svc_grp_ctx);
 
@@ -216,7 +216,7 @@
 axis2_char_t* AXIS2_CALL axis2_svc_grp_ctx_get_id(struct axis2_svc_grp_ctx *svc_grp_ctx, 
                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->id;
 }
 
@@ -225,7 +225,7 @@
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     svc_grp_ctx_impl = AXIS2_INTF_TO_IMPL(svc_grp_ctx);
     
@@ -250,7 +250,7 @@
 {
     axis2_svc_grp_ctx_impl_t *svc_grp_ctx_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     svc_grp_ctx_impl = AXIS2_INTF_TO_IMPL(svc_grp_ctx);
     
@@ -269,7 +269,7 @@
     axis2_hash_index_t *hi = NULL;
     void *next_svc = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, AXIS2_SUCCESS);
+    AXIS2_ENV_CHECK(env, AXIS2_SUCCESS);
     
     svc_grp_ctx_impl = AXIS2_INTF_TO_IMPL(svc_grp_ctx);
 
@@ -302,13 +302,13 @@
 axis2_svc_grp_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_grp(struct axis2_svc_grp_ctx *svc_grp_ctx, 
                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->svc_grp;
 }
 
 axis2_hash_t* AXIS2_CALL axis2_svc_grp_ctx_get_svc_ctx_map(struct axis2_svc_grp_ctx *svc_grp_ctx, 
                         axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_ctx, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(svc_grp_ctx)->svc_ctx_map;
 }

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Thu Feb  9 21:07:02 2006
@@ -242,7 +242,7 @@
 {
     axis2_arch_file_data_impl_t *file_data_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(arch_file_data, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     file_data_impl = AXIS2_INTF_TO_IMPL(arch_file_data);
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Thu Feb  9 21:07:02 2006
@@ -123,7 +123,7 @@
 {
     axis2_arch_reader_impl_t *feature_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(arch_reader, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     feature_impl = AXIS2_INTF_TO_IMPL(arch_reader);
     
@@ -308,7 +308,7 @@
     axis2_char_t *svc_container_path = NULL;
     axis2_char_t *svc_folder = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(arch_reader, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, dep_engine, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, svc_grp, AXIS2_FAILURE);
@@ -367,7 +367,7 @@
     axis2_om_element_t *svcs_element = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(arch_reader, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, svc_xml, AXIS2_FAILURE);    
     AXIS2_PARAM_CHECK((*env)->error, dep_engine, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, svc_grp, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Thu Feb  9 21:07:02 2006
@@ -142,7 +142,7 @@
 {
     axis2_conf_builder_impl_t *conf_builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     conf_builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     
@@ -185,10 +185,14 @@
     axis2_om_node_t *disp_order_node = NULL;
     axis2_status_t status = AXIS2_FAILURE;
    
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     
     conf_node  = AXIS2_DESC_BUILDER_BUILD_OM(conf_builder->desc_builder, env);
+    if(!conf_node)
+    {
+        return AXIS2_FAILURE;
+    }
     conf_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(conf_node, env);
     /* processing Paramters */
     /* Processing service level paramters */
@@ -356,7 +360,7 @@
     axis2_phase_t *disp_phase = NULL;
     int count = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, disp_order_node, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     
@@ -505,7 +509,7 @@
     axis2_conf_builder_impl_t *builder_impl = NULL;
     axis2_phases_info_t *info = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, phase_orders, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     
@@ -568,7 +572,7 @@
     axis2_qname_t *qphase = NULL;
     axis2_om_element_t *phase_orders_element;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, phase_orders_node, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     
@@ -620,7 +624,7 @@
 {
     axis2_conf_builder_impl_t *builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, trs_senders, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     
@@ -779,7 +783,7 @@
 {
     axis2_conf_builder_impl_t *builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, trs_recvs, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Feb  9 21:07:02 2006
@@ -467,7 +467,7 @@
 {
     axis2_dep_engine_impl_t *engine_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     if(engine_impl->curr_file)
@@ -581,7 +581,7 @@
 {
     axis2_dep_engine_impl_t *dep_engine_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, module_name, NULL);
     
     dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
@@ -592,7 +592,7 @@
 axis2_dep_engine_get_current_file_item(axis2_dep_engine_t *dep_engine,
                                         axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     return AXIS2_INTF_TO_IMPL(dep_engine)->curr_file;
 }
@@ -622,7 +622,7 @@
                                     axis2_ws_info_t *file) 
 {
     axis2_dep_engine_impl_t *dep_engine_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, file, AXIS2_FAILURE);
     dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     if(!(dep_engine_impl->ws_to_undeploy))
@@ -636,7 +636,7 @@
 axis2_dep_engine_get_phases_info(axis2_dep_engine_t *dep_engine,
                                     axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(dep_engine)->phases_info;
 }
 
@@ -649,7 +649,7 @@
 axis2_dep_engine_get_axis_conf(axis2_dep_engine_t *dep_engine,
                                 axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     return AXIS2_INTF_TO_IMPL(dep_engine)->conf;
 }
@@ -667,7 +667,7 @@
     axis2_param_t *para_hot_update = NULL;
     
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
     para_hot_dep = AXIS2_CONF_GET_PARAM(engine_impl->conf, env, 
@@ -702,7 +702,7 @@
     axis2_conf_builder_t *builder = NULL;
     axis2_repos_listener_t *repos_listener = NULL;
     axis2_status_t status = AXIS2_FAILURE;
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
     if(NULL == engine_impl->conf_name)
@@ -797,7 +797,7 @@
     axis2_bool_t is_repos_exist = AXIS2_FALSE;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, client_home, NULL);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
@@ -922,7 +922,7 @@
     int i = 0;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
     if(!engine_impl->module_list)
@@ -958,7 +958,7 @@
     axis2_char_t *phase2 = NULL;
     axis2_char_t *phase3 = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
     in_phases = AXIS2_PHASES_INFO_GET_IN_PHASES(engine_impl->phases_info, env);
@@ -1006,7 +1006,7 @@
     int sizei = 0;
     int i = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, svc_metadata, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
@@ -1141,7 +1141,7 @@
     axis2_flow_t *in_fault_flow = NULL;
     axis2_flow_t *out_fault_flow = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, svc, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
@@ -1271,7 +1271,7 @@
     int count = 0;
     int j = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, flow, AXIS2_FAILURE);
     
     count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
@@ -1311,7 +1311,7 @@
     axis2_param_t *impl_info_param = NULL;
     axis2_handler_t *handler = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, dll_name, NULL);
     
     dll_desc = axis2_dll_desc_create(env);
@@ -1398,7 +1398,7 @@
     int size = 0;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     
     size = AXIS2_ARRAY_LIST_SIZE(engine_impl->ws_to_deploy, env);
@@ -1490,7 +1490,7 @@
     int size = 0;
     axis2_char_t *svc_name = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     size = AXIS2_ARRAY_LIST_SIZE (engine_impl->ws_to_undeploy, env);
     
@@ -1531,7 +1531,7 @@
 axis2_dep_engine_is_hot_update(axis2_dep_engine_t *dep_engine,
                                 axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(dep_engine)->hot_update;
 }
 
@@ -1565,7 +1565,7 @@
                                     axis2_env_t **env,
                                     axis2_phases_info_t *phases_info) 
 {
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, phases_info, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(dep_engine)->phases_info = phases_info;
     return AXIS2_SUCCESS;
@@ -1592,7 +1592,7 @@
     axis2_svc_builder_t *builder = NULL;
     axis2_om_node_t *node = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(dep_engine, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
     engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Thu Feb  9 21:07:02 2006
@@ -219,7 +219,7 @@
 {
     axis2_desc_builder_impl_t *desc_builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     desc_builder_impl = AXIS2_INTF_TO_IMPL(desc_builder);
     
@@ -252,7 +252,7 @@
     axis2_om_document_t *document = NULL;
     axis2_om_node_t *root = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     builder_impl = AXIS2_INTF_TO_IMPL(desc_builder);
     
@@ -588,7 +588,7 @@
 {
     axis2_status_t status = AXIS2_FAILURE;
         
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, params, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, param_container, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, parent, AXIS2_FAILURE);
@@ -737,7 +737,7 @@
     axis2_qname_t *qref = NULL;
     axis2_status_t status = AXIS2_FAILURE;
         
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, module_refs, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
     desc_builder_impl = AXIS2_INTF_TO_IMPL(desc_builder);
@@ -801,7 +801,7 @@
     axis2_char_t *temp_path3 = NULL;
     axis2_conf_t *conf = NULL;
         
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, recv_element, NULL);
     class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
     recv_name = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(recv_element, env, class_qname);
@@ -888,7 +888,7 @@
     axis2_char_t *file_name_l = NULL;
     axis2_char_t *short_name = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
     
     file_name_l = AXIS2_STRDUP(file_name, env);
@@ -915,7 +915,7 @@
     axis2_char_t *file_name_l = NULL;
     axis2_char_t *short_name = NULL;
     int len = 0;
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, short_file_name, NULL);
     file_name_l = AXIS2_STRDUP(short_file_name, env);
     if(!file_name_l)
@@ -938,7 +938,7 @@
     axis2_char_t *value = NULL;
     axis2_char_t *in_l = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, in, NULL);
     
     in_l = AXIS2_STRDUP(in, env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Thu Feb  9 21:07:02 2006
@@ -120,7 +120,7 @@
 {
     axis2_module_builder_impl_t *module_builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(module_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     module_builder_impl = AXIS2_INTF_TO_IMPL(module_builder);
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Thu Feb  9 21:07:02 2006
@@ -164,7 +164,7 @@
                             axis2_env_t **env)
 {
     axis2_phases_info_impl_t *phases_info_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     phases_info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     
 	if(NULL != phases_info->ops)
@@ -190,7 +190,7 @@
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, in_phases, AXIS2_FAILURE);
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     if(info_impl->in_phases)
@@ -207,7 +207,7 @@
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, out_phases, AXIS2_FAILURE);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
@@ -224,7 +224,7 @@
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, in_faultphases, AXIS2_FAILURE);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
@@ -241,7 +241,7 @@
 {
     axis2_phases_info_impl_t *info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, out_faultphases, AXIS2_FAILURE);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
@@ -256,7 +256,7 @@
 axis2_phases_info_get_in_phases(axis2_phases_info_t *phases_info,
                                 axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     return AXIS2_INTF_TO_IMPL(phases_info)->in_phases;
 }
@@ -265,7 +265,7 @@
 axis2_phases_info_get_out_phases(axis2_phases_info_t *phases_info,
                                 axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     return AXIS2_INTF_TO_IMPL(phases_info)->out_phases;
 }
@@ -274,7 +274,7 @@
 axis2_phases_info_get_in_faultphases(axis2_phases_info_t *phases_info,
                                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     return AXIS2_INTF_TO_IMPL(phases_info)->in_faultphases;
 }
@@ -283,7 +283,7 @@
 axis2_phases_info_get_out_faultphases(axis2_phases_info_t *phases_info,
                                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     return AXIS2_INTF_TO_IMPL(phases_info)->out_faultphases;
 }
@@ -300,7 +300,7 @@
     axis2_array_list_t * op_in_phases = NULL; 
     axis2_status_t status = AXIS2_FAILURE;    
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     op_in_phases = axis2_array_list_create(env, 20);
@@ -362,7 +362,7 @@
     axis2_array_list_t * op_out_phases = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     op_out_phases = axis2_array_list_create(env, 20);
@@ -427,7 +427,7 @@
     axis2_array_list_t * op_in_faultphases = NULL;
     struct axis2_phase *phase = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     op_in_faultphases = axis2_array_list_create(env, 20);
@@ -466,7 +466,7 @@
     axis2_array_list_t * op_out_faultphases = NULL;
     struct axis2_phase *phase = NULL;
         
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);
     op_out_faultphases = axis2_array_list_create(env, 20);
@@ -506,7 +506,7 @@
     
     axis2_phases_info_impl_t *info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(phases_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, axis2_opt, AXIS2_FAILURE);
     
     info_impl = AXIS2_INTF_TO_IMPL(phases_info);

Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Thu Feb  9 21:07:02 2006
@@ -220,7 +220,7 @@
     axis2_char_t *module_path = NULL;
     axis2_char_t *temp_path = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     
     temp_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_PATH_SEP_STR, 
@@ -238,7 +238,7 @@
     axis2_char_t *svc_path = NULL;
     axis2_char_t *temp_path = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     
     temp_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_PATH_SEP_STR, 
@@ -254,7 +254,7 @@
 {
     axis2_repos_listener_impl_t *listener_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     /* TODO completet this */
     /* this call the update method of WSInfoList */
@@ -268,7 +268,7 @@
     axis2_repos_listener_impl_t *listener_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     
     status = AXIS2_WS_INFO_LIST_INIT(listener_impl->info_list, env);
@@ -295,7 +295,7 @@
 {
     axis2_repos_listener_impl_t *listener_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     
     AXIS2_WS_INFO_LIST_INIT(listener_impl->info_list, env);
@@ -317,7 +317,7 @@
     axis2_array_list_t *current_info_list = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, folder_name, AXIS2_FAILURE);
     listener_impl = AXIS2_INTF_TO_IMPL(listener);
     current_info_list = AXIS2_DIR_HANDLER_LIST_SERVICE_OR_MODULE_DIRS(env, 

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Feb  9 21:07:02 2006
@@ -173,7 +173,7 @@
 {
     axis2_svc_builder_impl_t *svc_builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     svc_builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
     
@@ -520,7 +520,7 @@
     axis2_svc_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *ops = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, op_itr, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
     
@@ -712,7 +712,7 @@
 {
     axis2_svc_builder_impl_t *builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, module_refs, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Thu Feb  9 21:07:02 2006
@@ -126,7 +126,7 @@
 {
     axis2_svc_grp_builder_impl_t *grp_builder_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(svc_grp_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     grp_builder_impl = AXIS2_INTF_TO_IMPL(svc_grp_builder);
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/ws_info.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Thu Feb  9 21:07:02 2006
@@ -158,7 +158,7 @@
 {
     axis2_ws_info_impl_t *ws_info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(ws_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     ws_info_impl = AXIS2_INTF_TO_IMPL(ws_info);
     
@@ -187,7 +187,7 @@
 axis2_ws_info_get_file_name(axis2_ws_info_t *ws_info,
                                 axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(ws_info, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(ws_info)->file_name;
 }
 
@@ -198,7 +198,7 @@
 {
     axis2_ws_info_impl_t *ws_info_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(ws_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
     
     ws_info_impl = AXIS2_INTF_TO_IMPL(ws_info);
@@ -215,7 +215,7 @@
 axis2_ws_info_get_last_modified_date(axis2_ws_info_t *ws_info,
                                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(ws_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     return AXIS2_INTF_TO_IMPL(ws_info)->last_modified_date;
 }
@@ -225,7 +225,7 @@
                                         axis2_env_t **env,
                                         long last_modified_date) 
 {
-    AXIS2_FUNC_PARAM_CHECK(ws_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(ws_info)->last_modified_date = last_modified_date;
     return AXIS2_SUCCESS;
 }
@@ -234,6 +234,6 @@
 axis2_ws_info_get_type(axis2_ws_info_t *ws_info,
                         axis2_env_t **env) 
 {
-    AXIS2_FUNC_PARAM_CHECK(ws_info, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(ws_info)->type;
 }

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?rev=376556&r1=376555&r2=376556&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Thu Feb  9 21:07:02 2006
@@ -223,7 +223,7 @@
     int size = 0;
     int i = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
     
     size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
@@ -254,7 +254,7 @@
     axis2_char_t *info_list_name = NULL;
     axis2_char_t *temp_name = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, file, AXIS2_FAILURE);
     
     temp_name = AXIS2_FILE_GET_NAME(file, env);
@@ -350,7 +350,7 @@
     axis2_ws_info_list_impl_t *info_list_impl = NULL;
     int i = 0;
     int size = 0;
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, file_name, NULL);
     info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
     
@@ -379,7 +379,7 @@
 {
     long last_modified_date = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, file, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, ws_info, AXIS2_FAILURE);
     
@@ -394,7 +394,7 @@
 {
     axis2_ws_info_t *ws_info = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
     ws_info = axis2_ws_info_list_get_file_item(info_list, env, file_name);
     return !(ws_info == NULL);
@@ -409,7 +409,7 @@
     axis2_array_list_t *temp_list = NULL;
     int i = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
 
     /* create temp list*/
@@ -492,7 +492,7 @@
     axis2_ws_info_list_impl_t *info_list_impl = NULL;
     axis2_status_t status = AXIS2_FAILURE;
     
-    AXIS2_FUNC_PARAM_CHECK(info_list, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
     
     status = axis2_ws_info_list_check_for_undeploy(info_list, env);