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 07:48:28 UTC

svn commit: r376579 [3/4] - in /webservices/axis2/trunk/c: modules/core/addr/ modules/core/clientapi/ modules/core/context/ modules/core/deployment/ modules/core/description/ modules/core/engine/ modules/core/transport/http/ modules/core/transport/http...

Modified: webservices/axis2/trunk/c/modules/xml/om/om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_output.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_output.c Thu Feb  9 22:48:20 2006
@@ -116,7 +116,7 @@
 axis2_om_output_create (axis2_env_t **env, axis2_xml_writer_t *xml_writer)
 {
     axis2_om_output_impl_t *om_output_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(xml_writer, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     
     om_output_impl = (axis2_om_output_impl_t *) AXIS2_MALLOC (
                         (*env)->allocator,
@@ -195,7 +195,7 @@
                       axis2_env_t **env)
 {
     axis2_om_output_impl_t *om_output_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     om_output_impl = AXIS2_INTF_TO_IMPL(om_output);
     if(om_output_impl->xml_version)
     {
@@ -226,7 +226,7 @@
 axis2_om_output_is_soap11(axis2_om_output_t *om_output,
                           axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(om_output)->is_soap11;
 } 
                                                                                     
@@ -235,7 +235,7 @@
                             (axis2_om_output_t *om_output,
                              axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(om_output)->ignore_xml_declaration;
 
 }                               
@@ -246,7 +246,7 @@
                             axis2_env_t **env,
                             axis2_bool_t ignore_xml_dec)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, ignore_xml_dec, AXIS2_FAILURE); 
     AXIS2_INTF_TO_IMPL(om_output)->ignore_xml_declaration = ignore_xml_dec;
     return AXIS2_SUCCESS;
@@ -257,7 +257,7 @@
                            axis2_env_t **env,
                            axis2_bool_t soap11)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap11, AXIS2_FAILURE); 
     AXIS2_INTF_TO_IMPL(om_output)->is_soap11 = soap11;
     return AXIS2_SUCCESS;
@@ -268,7 +268,7 @@
                                 axis2_env_t **env,
                                 axis2_char_t *xml_version)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, xml_version, AXIS2_FAILURE); 
     if(AXIS2_INTF_TO_IMPL(om_output)->xml_version)
         AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(om_output)->xml_version);
@@ -280,7 +280,7 @@
 axis2_om_output_get_xml_version(axis2_om_output_t *om_output,
                                 axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(om_output)->xml_version;
 }  
                             
@@ -291,7 +291,7 @@
                             axis2_char_t *char_set_encoding)
 {
 
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, char_set_encoding, AXIS2_FAILURE); 
     AXIS2_INTF_TO_IMPL(om_output)->char_set_encoding = char_set_encoding;
     if(AXIS2_INTF_TO_IMPL(om_output)->xml_version)
@@ -304,7 +304,7 @@
                             (axis2_om_output_t *om_output,
                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(om_output)->char_set_encoding;
 } 
                             
@@ -314,7 +314,7 @@
                             axis2_env_t **env,
                             axis2_bool_t optimize)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, optimize, AXIS2_FAILURE); 
     AXIS2_INTF_TO_IMPL(om_output)->do_optimize = optimize;
     return AXIS2_SUCCESS;    
@@ -325,7 +325,7 @@
                             (axis2_om_output_t *om_output,
                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(om_output)->xml_writer;
 
 }                                                                                                                                                                             
@@ -345,7 +345,7 @@
     int i = 0;
     va_list ap;
     
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     om_output_impl = AXIS2_INTF_TO_IMPL(om_output);
 
     va_start (ap, no_of_args);
@@ -482,7 +482,7 @@
                                            axis2_env_t **env)
 {
     axis2_om_output_impl_t *output_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(om_output, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     output_impl = AXIS2_INTF_TO_IMPL(om_output);
     AXIS2_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(
                                 output_impl->xml_writer, 

Modified: webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c Thu Feb  9 22:48:20 2006
@@ -166,7 +166,7 @@
                                       axis2_env_t **env)
 {
         axis2_om_processing_instruction_impl_t *pi_impl = NULL;
-        AXIS2_FUNC_PARAM_CHECK(om_pi, env, AXIS2_FAILURE);
+        AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
         
         pi_impl = AXIS2_INTF_TO_IMPL(om_pi);
         
@@ -192,7 +192,7 @@
                                           axis2_env_t **env,
                                           const axis2_char_t *value)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_pi, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(om_pi)->value = (axis2_char_t*)AXIS2_STRDUP(value,env);
     return AXIS2_SUCCESS;
@@ -204,7 +204,7 @@
                                            axis2_env_t **env,
                                            const axis2_char_t *target)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_pi, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, target, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(om_pi)->target = (axis2_char_t*)AXIS2_STRDUP(target,env);
     return AXIS2_SUCCESS;
@@ -215,14 +215,14 @@
 axis2_om_processing_instruction_get_value(axis2_om_processing_instruction_t *om_pi,
                                           axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_pi, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(om_pi)->value;
 }                                          
 axis2_char_t*  AXIS2_CALL
 axis2_om_processing_instruction_get_target(axis2_om_processing_instruction_t *om_pi,
                                            axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_pi, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(om_pi)->target;
 }
 
@@ -234,7 +234,7 @@
                                  axis2_om_output_t *om_output)
 {
     axis2_om_processing_instruction_impl_t *om_pi_impl;
-    AXIS2_FUNC_PARAM_CHECK(om_pi, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, om_output, AXIS2_FAILURE);
         
     om_pi_impl = AXIS2_INTF_TO_IMPL(om_pi);

Modified: webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c Thu Feb  9 22:48:20 2006
@@ -198,7 +198,7 @@
     axis2_om_stax_builder_impl_t *builder_impl = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
     
-    AXIS2_FUNC_PARAM_CHECK(om_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, element_node, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(om_builder);
     
@@ -252,7 +252,7 @@
     axis2_om_node_t *node = NULL;
     axis2_om_stax_builder_impl_t *builder = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
     
     if (!builder->lastnode)
@@ -302,7 +302,7 @@
     axis2_om_node_t *parent = NULL;
     axis2_om_stax_builder_impl_t *builder = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
     
@@ -362,7 +362,7 @@
     
     axis2_om_stax_builder_impl_t *builder = NULL;
     int i=0;
-    AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
     
@@ -453,7 +453,7 @@
     axis2_om_stax_builder_impl_t *builder_impl = NULL;
     axis2_char_t *temp_localname = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(om_stax_builder);
     temp_localname  = AXIS2_XML_READER_GET_NAME (builder_impl->parser, env);
 
@@ -531,7 +531,7 @@
     axis2_om_node_t *comment_node = NULL;
     axis2_om_stax_builder_impl_t *builder_impl = NULL;
     axis2_char_t *comment_value = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
     comment_value  = AXIS2_XML_READER_GET_VALUE(builder_impl->parser, env);
@@ -582,7 +582,7 @@
     axis2_om_node_t *doctype_node = NULL;
     axis2_char_t *doc_value = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
     doc_value = AXIS2_XML_READER_GET_DTD(builder_impl->parser, env);
@@ -609,7 +609,7 @@
     axis2_char_t *target = NULL;
     axis2_char_t *value  = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
     target = AXIS2_XML_READER_GET_PI_TARGET (builder_impl->parser, env);
@@ -657,7 +657,7 @@
     axis2_om_node_t *parent = NULL;
     axis2_om_stax_builder_impl_t *builder = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, AXIS2_FAILURE );
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE );
     
     builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
     builder->element_level--;
@@ -691,7 +691,7 @@
     int token = 0;
     axis2_om_stax_builder_impl_t *builder_impl = NULL;
     axis2_om_node_t *node = NULL;
-    AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
 
     builder_impl = AXIS2_INTF_TO_IMPL(om_stax_builder);
     
@@ -785,7 +785,7 @@
                                       axis2_env_t **env)
 {
     axis2_om_stax_builder_impl_t *builder_impl =  NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     if(builder_impl->parser)
@@ -805,7 +805,7 @@
 axis2_om_stax_builder_get_document (axis2_om_stax_builder_t *builder,
                                     axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(builder,env,NULL);
+    AXIS2_ENV_CHECK(env,NULL);
     return AXIS2_INTF_TO_IMPL(builder)->document;
 }
                                     
@@ -816,7 +816,7 @@
                                     axis2_env_t **env,
                                     axis2_om_document_t *document)
 {
-    AXIS2_FUNC_PARAM_CHECK(builder,env,AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, document , AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(builder)->document = document ;
     return AXIS2_SUCCESS;
@@ -826,7 +826,7 @@
 axis2_om_stax_builder_get_current_event(axis2_om_stax_builder_t *builder,
                                         axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(builder, env, -1);
+    AXIS2_ENV_CHECK(env, -1);
     return AXIS2_INTF_TO_IMPL(builder)->current_event;
 } 
 
@@ -835,7 +835,7 @@
 axis2_om_stax_builder_get_lastnode(axis2_om_stax_builder_t *builder,
                                     axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(builder)->lastnode;   
 }
 
@@ -844,7 +844,7 @@
                                    axis2_env_t **env)
 {
     axis2_om_stax_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     return builder_impl->done;    
 }                                                                                                              

Modified: webservices/axis2/trunk/c/modules/xml/om/om_text.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_text.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_text.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_text.c Thu Feb  9 22:48:20 2006
@@ -137,7 +137,7 @@
 axis2_om_text_free (axis2_om_text_t * om_text,
                     axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_text, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if (AXIS2_INTF_TO_IMPL(om_text)->value)
         AXIS2_FREE ((*env)->allocator, AXIS2_INTF_TO_IMPL(om_text)->value);
@@ -157,7 +157,7 @@
                          axis2_om_output_t * om_output)
 {
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(om_text, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, om_output, AXIS2_FAILURE);
     
     if (AXIS2_INTF_TO_IMPL(om_text)->value)
@@ -171,7 +171,7 @@
 axis2_om_text_get_value(axis2_om_text_t *om_text,
                         axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_text, env,NULL);
+    AXIS2_ENV_CHECK(env,NULL);
     return AXIS2_INTF_TO_IMPL(om_text)->value;
 }                        
 
@@ -180,7 +180,7 @@
                         axis2_env_t **env,
                         const axis2_char_t *value)
 {
-    AXIS2_FUNC_PARAM_CHECK(om_text, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error , om_text, AXIS2_FAILURE);
     if(AXIS2_INTF_TO_IMPL(om_text)->value)
         AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(om_text)->value);

Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_reader_wrapper.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_reader_wrapper.c Thu Feb  9 22:48:20 2006
@@ -352,7 +352,7 @@
                              axis2_env_t **env)
 {
     int i =-1;
-    AXIS2_FUNC_PARAM_CHECK(parser,env, -1);
+    AXIS2_ENV_CHECK(env, -1);
     i = guththila_xml_pull_parser_next(AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
             AXIS2_INTF_TO_IMPL(parser)->guththila_parser); 
     return i == -1 ? -1 : AXIS2_INTF_TO_IMPL(parser)->event_map[i]; 
@@ -365,7 +365,7 @@
                              axis2_env_t **env)
 {
     guththila_xml_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser,env,AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     if(parser_impl->reader)
         guththila_reader_free(parser_impl->guththila_env,
@@ -389,7 +389,7 @@
 guththila_xml_reader_wrapper_get_attribute_count(axis2_xml_reader_t *parser,
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     return guththila_xml_pull_parser_get_attribute_count(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser);
@@ -400,7 +400,7 @@
                                                      axis2_env_t **env,
                                                      int i)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_attribute_name_by_number(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);    
@@ -413,7 +413,7 @@
                                                        axis2_env_t **env,
                                                        int i)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_attribute_prefix_by_number(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);    
@@ -427,7 +427,7 @@
                                                       axis2_env_t **env,
                                                       int i)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_attribute_value_by_number(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);    
@@ -442,7 +442,7 @@
                                                  axis2_env_t **env,
                                                  int i)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_attribute_namespace_by_number(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);    
@@ -455,7 +455,7 @@
 guththila_xml_reader_wrapper_get_value(axis2_xml_reader_t *parser,
                                   axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_value(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser);    
@@ -467,7 +467,7 @@
 guththila_xml_reader_wrapper_get_namespace_count(axis2_xml_reader_t *parser,
                                             axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return guththila_xml_pull_parser_get_namespace_count(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser);    
@@ -480,7 +480,7 @@
                                                     axis2_env_t **env,
                                                     int i)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_namespace_uri_by_number(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);    
@@ -494,7 +494,7 @@
                                                 axis2_env_t **env,
                                                 int i)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_namespace_prefix_by_number(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser, i);    
@@ -506,7 +506,7 @@
 guththila_xml_reader_wrapper_get_prefix(axis2_xml_reader_t *parser,
                                    axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_prefix(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser);    
@@ -518,7 +518,7 @@
 guththila_xml_reader_wrapper_get_name(axis2_xml_reader_t *parser,
                                  axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return guththila_xml_pull_parser_get_name(
                     AXIS2_INTF_TO_IMPL(parser)->guththila_env, 
                     AXIS2_INTF_TO_IMPL(parser)->guththila_parser);    
@@ -555,7 +555,7 @@
                                  axis2_env_t **env,
                                  void *data)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, data, AXIS2_FAILURE);
     GUTHTHILA_FREE(AXIS2_INTF_TO_IMPL(parser)->guththila_env->allocator,
                    data);

Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_writer_wrapper.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/guththila_xml_writer_wrapper.c Thu Feb  9 22:48:20 2006
@@ -342,7 +342,7 @@
 guththila_xml_writer_wrapper_free(axis2_xml_writer_t *writer,
                                   axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     if(AXIS2_INTF_TO_IMPL(writer)->guththila_writer)
         guththila_xml_stream_writer_free(
             AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -363,7 +363,7 @@
                                     axis2_char_t *localname)
 {
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     status = guththila_xml_stream_writer_write_start_element(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -376,7 +376,7 @@
 guththila_xml_writer_wrapper_end_start_element(axis2_xml_writer_t *writer,
                                                axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     return guththila_xml_stream_writer_end_start_element(    
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
                     AXIS2_INTF_TO_IMPL(writer)->guththila_writer);
@@ -389,7 +389,7 @@
                                         axis2_char_t *localname,
                                         axis2_char_t *namespace_uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error,namespace_uri, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_start_element_with_namespace(
@@ -407,7 +407,7 @@
                                         axis2_char_t *namespace_uri,
                                         axis2_char_t *prefix)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname,  AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
@@ -424,7 +424,7 @@
                                         axis2_env_t **env,
                                         axis2_char_t *localname)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_empty_element(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -440,7 +440,7 @@
                                         axis2_char_t *localname,
                                         axis2_char_t *namespace_uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_empty_element_with_namespace(
@@ -457,7 +457,7 @@
                                         axis2_char_t *namespace_uri,
                                         axis2_char_t *prefix)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
@@ -474,7 +474,7 @@
 guththila_xml_writer_wrapper_write_end_element(axis2_xml_writer_t *writer,
                                                axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_end_element(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
                     AXIS2_INTF_TO_IMPL(writer)->guththila_writer);
@@ -484,7 +484,7 @@
 guththila_xml_writer_wrapper_write_end_document(axis2_xml_writer_t *writer,
                                                axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_end_document(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
                     AXIS2_INTF_TO_IMPL(writer)->guththila_writer);
@@ -497,7 +497,7 @@
                                            axis2_char_t *localname,
                                            axis2_char_t *value)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_attribute(
@@ -517,7 +517,7 @@
                                           axis2_char_t *value,
                                           axis2_char_t *namespace_uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname,  AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
@@ -537,7 +537,7 @@
                                           axis2_char_t *namespace_uri,
                                           axis2_char_t *prefix)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
@@ -557,7 +557,7 @@
                                              axis2_char_t *prefix,
                                              axis2_char_t *namespace_uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix , AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_namespace(
@@ -574,7 +574,7 @@
                                              axis2_env_t **env,
                                              axis2_char_t *namespace_uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_default_namespace(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -588,7 +588,7 @@
                                            axis2_env_t **env,
                                            axis2_char_t *value)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_comment(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -604,7 +604,7 @@
                                            axis2_env_t **env,
                                            axis2_char_t *target)
 {   
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, target, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_processing_instruction(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -621,7 +621,7 @@
                                            axis2_char_t *target,
                                            axis2_char_t *data)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, target, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, data, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_processing_instruction_data(
@@ -636,7 +636,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *data)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, data, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_cdata(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -650,7 +650,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *dtd)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, dtd, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_dtd(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -664,7 +664,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *name)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_entity_ref(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -678,7 +678,7 @@
                                          axis2_xml_writer_t *writer,
                                          axis2_env_t **env)
 {
-     AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+     AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
      return guththila_xml_stream_writer_write_start_document(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
                     AXIS2_INTF_TO_IMPL(writer)->guththila_writer);
@@ -690,7 +690,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *version)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, version, AXIS2_FAILURE); 
     return guththila_xml_stream_writer_write_start_document_with_version(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -705,7 +705,7 @@
                                          axis2_char_t *encoding,
                                          axis2_char_t *version)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, encoding, AXIS2_FAILURE); 
     AXIS2_PARAM_CHECK((*env)->error, version, AXIS2_FAILURE); 
     
@@ -722,7 +722,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *text)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, text, AXIS2_FAILURE); 
     return guththila_xml_stream_writer_write_characters(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -735,7 +735,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
     return guththila_xml_stream_writer_get_prefix(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -751,7 +751,7 @@
                                          axis2_char_t *prefix,
                                          axis2_char_t *uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, uri, AXIS2_FAILURE);
     return guththila_xml_stream_writer_set_prefix(
@@ -765,7 +765,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, uri, AXIS2_FAILURE);
     return guththila_xml_stream_writer_set_default_prefix(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,
@@ -779,7 +779,7 @@
                                          axis2_char_t *text,
                                          int in_attr)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, text, AXIS2_FAILURE);
     return guththila_xml_stream_writer_write_encoded(
                     AXIS2_INTF_TO_IMPL(writer)->guththila_env,

Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c Thu Feb  9 22:48:20 2006
@@ -213,7 +213,7 @@
 {
     
 	axis2_libxml2_reader_wrapper_impl_t *wrapper_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(filename, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     
     wrapper_impl = (axis2_libxml2_reader_wrapper_impl_t*)AXIS2_MALLOC((*env)->allocator,
          sizeof(axis2_libxml2_reader_wrapper_impl_t));
@@ -307,7 +307,7 @@
 {
     
 	axis2_libxml2_reader_wrapper_impl_t *wrapper_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(read_input_callback, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     
     wrapper_impl = (axis2_libxml2_reader_wrapper_impl_t*)AXIS2_MALLOC((*env)->allocator,
          sizeof(axis2_libxml2_reader_wrapper_impl_t));
@@ -411,7 +411,7 @@
     int node = 2;
     int empty_check = 0;
     axis2_libxml2_reader_wrapper_impl_t *parser_impl; 
-    AXIS2_FUNC_PARAM_CHECK(parser,env, -1);
+    AXIS2_ENV_CHECK(env, -1);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     /* if end_element event after empty element event is not required remove
         this if close 
@@ -461,7 +461,7 @@
 axis2_libxml2_reader_wrapper_free(axis2_xml_reader_t *parser,
                            axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser,env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(AXIS2_INTF_TO_IMPL(parser)->reader)
     {
         xmlTextReaderClose(AXIS2_INTF_TO_IMPL(parser)->reader);
@@ -479,7 +479,7 @@
                                           axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl=NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser,env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     if(parser_impl->current_event == AXIS2_XML_READER_START_ELEMENT ||
        parser_impl->current_event == AXIS2_XML_READER_EMPTY_ELEMENT )
@@ -494,7 +494,7 @@
                                                    int i)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     if(parser_impl->current_attribute_count >0 && 
@@ -516,7 +516,7 @@
                                                      int i)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     if(parser_impl->current_attribute_count >0 && 
@@ -540,7 +540,7 @@
 {
     
     axis2_libxml2_reader_wrapper_impl_t *parser_impl;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     if(parser_impl->current_attribute_count >0 && 
@@ -563,7 +563,7 @@
                                                      int i)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     if(parser_impl->current_attribute_count >0 && 
@@ -587,7 +587,7 @@
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
 
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     return (axis2_char_t*)xmlTextReaderValue(parser_impl->reader);
    
@@ -598,7 +598,7 @@
                                           axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser,env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     if(parser_impl->current_event == AXIS2_XML_READER_START_ELEMENT ||
        parser_impl->current_event == AXIS2_XML_READER_EMPTY_ELEMENT)
@@ -614,7 +614,7 @@
                                                   int i)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     if(parser_impl->current_namespace_count >0 && 
@@ -637,7 +637,7 @@
                                                 	 int i)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     if(parser_impl->current_namespace_count >0 && 
@@ -662,7 +662,7 @@
                                  axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     xmlTextReaderMoveToElement(parser_impl->reader);
     return (axis2_char_t*)xmlTextReaderPrefix(parser_impl->reader);
@@ -673,7 +673,7 @@
                                axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     xmlTextReaderMoveToElement(parser_impl->reader);
     return (axis2_char_t*)xmlTextReaderLocalName(parser_impl->reader);
@@ -685,7 +685,7 @@
                                     axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     if(parser_impl->current_event ==  AXIS2_XML_READER_PROCESSING_INSTRUCTION)
         return (axis2_char_t*)xmlTextReaderLocalName(parser_impl->reader);
@@ -698,7 +698,7 @@
                                   axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     if(parser_impl->current_event ==  AXIS2_XML_READER_DOCUMENT_TYPE)
         return (axis2_char_t*)xmlTextReaderLocalName(parser_impl->reader);
@@ -712,7 +712,7 @@
                                   axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     if(parser_impl->current_event ==  AXIS2_XML_READER_PROCESSING_INSTRUCTION)
          return (axis2_char_t*)xmlTextReaderValue(parser_impl->reader);
@@ -727,7 +727,7 @@
                                axis2_env_t **env,
                                void *data)
 {
-    AXIS2_FUNC_PARAM_CHECK(parser, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, data, AXIS2_FAILURE);
     xmlFree(data);
     return AXIS2_SUCCESS;
@@ -738,7 +738,7 @@
                                            axis2_env_t **env)
 {
     axis2_libxml2_reader_wrapper_impl_t *reader_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     reader_impl = AXIS2_INTF_TO_IMPL(parser);
     return xmlTextReaderConstEncoding(reader_impl->reader);
 }                                           
@@ -753,7 +753,7 @@
     char *q_name = NULL;
     axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(parser, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     parser_impl = AXIS2_INTF_TO_IMPL(parser);
     
     libxml2_attribute_count = xmlTextReaderAttributeCount(parser_impl->reader);

Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_writer_wrapper.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_writer_wrapper.c Thu Feb  9 22:48:20 2006
@@ -532,7 +532,7 @@
                                   axis2_env_t **env)
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
 
    
@@ -570,7 +570,7 @@
 {
     int status = 0;
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     
@@ -589,7 +589,7 @@
 axis2_libxml2_writer_wrapper_end_start_element(axis2_xml_writer_t *writer,
                                                axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     /* nothing to do , 
        it is automatically taken care by the libxml2 writer */
     return AXIS2_SUCCESS;
@@ -604,7 +604,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error,namespace_uri, AXIS2_FAILURE);
     
@@ -635,7 +635,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname,  AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
@@ -672,7 +672,7 @@
 {
     int status = 0;
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
 
@@ -702,7 +702,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error,namespace_uri, AXIS2_FAILURE);
     
@@ -740,7 +740,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname,  AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
@@ -780,7 +780,7 @@
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     status = xmlTextWriterFullEndElement(writer_impl->xml_writer);
@@ -800,7 +800,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
   
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     status =  xmlTextWriterEndDocument(writer_impl->xml_writer);
@@ -823,7 +823,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     
@@ -851,7 +851,7 @@
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
     axis2_bool_t exists = AXIS2_FALSE;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname,  AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
@@ -890,7 +890,7 @@
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, localname,  AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
@@ -935,7 +935,7 @@
     int status = 0;
     int exists = AXIS2_FALSE;
     char *xmlnsprefix = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix , AXIS2_FAILURE);
     
@@ -981,7 +981,7 @@
     int status = 0;
     int exists = AXIS2_FALSE;
     axis2_char_t *xmlns = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE)
     
     exists = axis2_libxml2_writer_wrapper_validate_namespace(writer, env, namespace_uri, NULL);
@@ -1013,7 +1013,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
     
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
@@ -1037,7 +1037,7 @@
 {   
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, target, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     
@@ -1060,7 +1060,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, target, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, data, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
@@ -1084,7 +1084,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, data, AXIS2_FAILURE);
     
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
@@ -1105,7 +1105,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, dtd, AXIS2_FAILURE);
     
     status = xmlTextWriterStartDTD(writer_impl->xml_writer,
@@ -1124,7 +1124,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *name)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
     printf("not implemented ");
     return AXIS2_FAILURE;
@@ -1137,7 +1137,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *wrapper_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     
     wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
     status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
@@ -1158,7 +1158,7 @@
 {   
     axis2_libxml2_writer_wrapper_impl_t *wrapper_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, version, AXIS2_FAILURE);
     
     wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
@@ -1181,7 +1181,7 @@
 {
     axis2_libxml2_writer_wrapper_impl_t *wrapper_impl = NULL;
     int status = 0;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     
     wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
     status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
@@ -1204,7 +1204,7 @@
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int status = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, text, AXIS2_FAILURE); 
     
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
@@ -1225,7 +1225,7 @@
                                          axis2_char_t *uri)
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, NULL);
+    AXIS2_ENV_CHECK( env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     printf("not implemented ");
@@ -1239,7 +1239,7 @@
                                          axis2_char_t *uri)
 {   
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, prefix, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, uri, AXIS2_FAILURE);
     
@@ -1253,7 +1253,7 @@
                                          axis2_env_t **env,
                                          axis2_char_t *uri)
 {
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, uri, AXIS2_FAILURE);
     
     printf(" not implemented ");
@@ -1268,7 +1268,7 @@
                                          int in_attr)
 {
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, text, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     printf(" not implemented ");
@@ -1285,7 +1285,7 @@
     int i = 0;
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     if(!prefix && !ns_uri)
         return AXIS2_FAILURE;
@@ -1353,7 +1353,7 @@
     axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
     int i = 0;
     
-    AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK( env, AXIS2_FAILURE);
     
     writer_impl = AXIS2_INTF_TO_IMPL(writer);
     

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c Thu Feb  9 22:48:20 2006
@@ -117,7 +117,7 @@
                                  axis2_env_t **env)
 {
     axis2_soap11_builder_helper_impl_t *builder_helper_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder_helper, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_helper_impl = AXIS2_INTF_TO_IMPL(builder_helper);
 
    
@@ -145,7 +145,7 @@
     axis2_soap_body_t *soap_body = NULL;
     axis2_soap_fault_t *soap_fault = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(builder_helper, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_helper_impl = AXIS2_INTF_TO_IMPL(builder_helper);
       
     om_ele = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(om_element_node, env);

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c Thu Feb  9 22:48:20 2006
@@ -137,7 +137,7 @@
                                  axis2_env_t **env)
 {
     axis2_soap12_builder_helper_impl_t *builder_helper_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder_helper, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_helper_impl = AXIS2_INTF_TO_IMPL(builder_helper);
 
     if(builder_helper_impl->detail_element_names)
@@ -169,7 +169,7 @@
     axis2_soap_fault_t *soap_fault = NULL;
     axis2_soap_envelope_t *soap_envelope = NULL;    
     
-    AXIS2_FUNC_PARAM_CHECK(builder_helper, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, om_ele_node, AXIS2_FAILURE);
 
     builder_helper_impl = AXIS2_INTF_TO_IMPL(builder_helper);

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_body.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_body.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_body.c Thu Feb  9 22:48:20 2006
@@ -198,7 +198,7 @@
                        axis2_env_t **env)
 {
     axis2_soap_body_impl_t *body_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     body_impl = AXIS2_INTF_TO_IMPL(body);
     if(body_impl->soap_fault)
     {
@@ -228,7 +228,7 @@
 {
     axis2_soap_body_impl_t *body_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     body_impl = AXIS2_INTF_TO_IMPL(body);
     if(body_impl->soap_fault)
     {
@@ -262,7 +262,7 @@
     axis2_env_t **env) 
 {
     axis2_soap_body_impl_t *body_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(body, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     body_impl = AXIS2_INTF_TO_IMPL(body);
     if(body_impl->soap_fault)
     {
@@ -323,7 +323,7 @@
 {
     axis2_soap_body_impl_t *body_impl = NULL;
     axis2_om_node_t *fault_node = NULL;
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_fault, AXIS2_FAILURE);
     body_impl = AXIS2_INTF_TO_IMPL(body);
     
@@ -348,7 +348,7 @@
 axis2_soap_body_get_base_node(axis2_soap_body_t *body,
                                 axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(body, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(body)->om_ele_node;
 }
 
@@ -358,7 +358,7 @@
                               axis2_om_node_t *node)
 {
    axis2_soap_body_impl_t *body_impl = NULL;
-   AXIS2_FUNC_PARAM_CHECK( body, env, AXIS2_FAILURE);
+   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
    body_impl = AXIS2_INTF_TO_IMPL(body);
    if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
@@ -375,7 +375,7 @@
 axis2_soap_body_get_soap_version(axis2_soap_body_t *body,
                                    axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(body)->soap_version;    
 }
                                              
@@ -384,7 +384,7 @@
                                    axis2_env_t **env,
                                    int soap_version)
 {
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(body)->soap_version = soap_version;
     return AXIS2_SUCCESS;
 }
@@ -408,7 +408,7 @@
 {
     axis2_soap_body_impl_t *soap_body_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(body, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_body_impl = AXIS2_INTF_TO_IMPL(body);
     if(soap_body_impl->om_ele_node && soap_body_impl->soap_builder)
     {

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_builder.c Thu Feb  9 22:48:20 2006
@@ -239,7 +239,7 @@
                               axis2_env_t **env)
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     if(builder_impl->builder_helper)
     {
@@ -268,7 +268,7 @@
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
     if(!(builder_impl->om_builder))
@@ -291,7 +291,7 @@
                                  axis2_env_t **env)
  {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     return AXIS2_OM_STAX_BUILDER_GET_DOCUMENT(builder_impl->om_builder, env);
  }
@@ -305,7 +305,7 @@
     int current_event = AXIS2_MAX_EVENT;
     axis2_om_node_t *current_node =  NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     if(builder_impl->done)
     {
@@ -354,7 +354,7 @@
                                  axis2_env_t **env)
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     return AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(builder_impl->soap_envelope, env);
 } 
@@ -369,7 +369,7 @@
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
     int ret_val = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK( builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, current_node, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     if(builder_impl->last_node_status == AXIS2_BUILDER_LAST_NODE_NULL)
@@ -409,7 +409,7 @@
     int element_level = 0;
     int status = AXIS2_SUCCESS;
     
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, om_element_node, AXIS2_FAILURE);
     
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
@@ -593,7 +593,7 @@
     axis2_om_element_t *om_ele = NULL;
     axis2_om_namespace_t *om_ns = NULL;
     axis2_char_t *ns_uri = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, om_node, AXIS2_FAILURE);
     if(!is_soap_element)
         return AXIS2_SUCCESS;
@@ -701,7 +701,7 @@
                                      axis2_bool_t value)
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     builder_impl->processing_mandatory_fault_elements = value;
     return AXIS2_SUCCESS;
@@ -714,7 +714,7 @@
                                      axis2_bool_t value)
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     builder_impl->processing_detail_elements = value;
     return AXIS2_SUCCESS;
@@ -726,7 +726,7 @@
                              axis2_env_t **env)
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     return builder_impl->processing_detail_elements ;
 }     
@@ -736,7 +736,7 @@
                              axis2_env_t **env)
 {
     axis2_soap_builder_impl_t *builder_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(builder, env, AXIS2_FALSE);
+    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
      builder_impl = AXIS2_INTF_TO_IMPL(builder);
     return builder_impl->soap_version ;
 }

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Thu Feb  9 22:48:20 2006
@@ -245,7 +245,7 @@
                        axis2_env_t **env)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     if(envelope_impl->header)
     {
@@ -277,7 +277,7 @@
 axis2_soap_envelope_get_base_node(axis2_soap_envelope_t *envelope,
                                 axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(envelope)->om_ele_node;
 }
 
@@ -287,7 +287,7 @@
                                   axis2_om_node_t *node)
 {
    axis2_soap_envelope_impl_t *envelope_impl = NULL;
-   AXIS2_FUNC_PARAM_CHECK( envelope, env, AXIS2_FAILURE);
+   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
    envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
    if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
@@ -303,7 +303,7 @@
 axis2_soap_envelope_get_soap_version(axis2_soap_envelope_t *envelope,
                                    axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(envelope)->soap_version;    
 }
                                              
@@ -312,7 +312,7 @@
                                    axis2_env_t **env,
                                    int soap_version)
 {
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(envelope)->soap_version = soap_version;
     return AXIS2_SUCCESS;
 }
@@ -323,7 +323,7 @@
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     if(envelope_impl->header)
     {
@@ -350,7 +350,7 @@
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
     axis2_om_namespace_t *ns = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     /* TODO : cache SOAP header and envelope instead of looking them up?*/
@@ -369,7 +369,7 @@
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     if(envelope_impl->body)
@@ -397,7 +397,7 @@
                               axis2_bool_t cache)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
 /*
    if soap version is soap11 we modify the soap fault part.
@@ -505,7 +505,7 @@
                             axis2_soap_body_t *body)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     if (!(envelope_impl->body))
@@ -524,7 +524,7 @@
     axis2_env_t **env, axis2_soap_header_t *header)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     if (!(envelope_impl->header))
@@ -544,7 +544,7 @@
                                   axis2_env_t **env)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     
     if (envelope_impl->om_ele_node)
@@ -568,7 +568,7 @@
                                 axis2_soap_builder_t *soap_builder)
 {
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(envelope, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_builder, AXIS2_FAILURE);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
     envelope_impl->soap_builder = soap_builder;

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault.c Thu Feb  9 22:48:20 2006
@@ -277,7 +277,7 @@
                       axis2_env_t **env)
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     
     if(fault_impl->fcode)
@@ -321,7 +321,7 @@
                           axis2_soap_fault_code_t *code)
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, code, AXIS2_FAILURE);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     /* axis2_soap_fault_get_code(fault_code, env); 
@@ -349,7 +349,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     if(fault_impl->fcode)
     {
@@ -388,7 +388,7 @@
                             axis2_soap_fault_reason_t *reason)
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, reason, AXIS2_FAILURE);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
    /*
@@ -419,7 +419,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     if(fault_impl->freason)
     {
@@ -458,7 +458,7 @@
                           axis2_soap_fault_node_t *node)
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
    /* 
@@ -489,7 +489,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     
     if(fault_impl->fnode)
@@ -530,7 +530,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
    
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, role, AXIS2_FAILURE);
     
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
@@ -563,7 +563,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     if(fault_impl->frole)
     {
@@ -604,7 +604,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, detail, AXIS2_FAILURE);
     
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
@@ -640,7 +640,7 @@
 {
     axis2_soap_fault_impl_t *fault_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     if(fault_impl->fdetail)
     {
@@ -681,7 +681,7 @@
                                axis2_om_node_t *node)
 {
    axis2_soap_fault_impl_t *fault_impl = NULL;
-   AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
    fault_impl = AXIS2_INTF_TO_IMPL(fault);
 
@@ -699,7 +699,7 @@
 axis2_soap_fault_get_base_node(axis2_soap_fault_t *fault,
                                axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(fault)->om_ele_node;
 }  
                                                 
@@ -708,7 +708,7 @@
                                   axis2_env_t **env,
                                   int soap_version)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_version, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(fault)->soap_version = soap_version;
     return AXIS2_SUCCESS;
@@ -719,7 +719,7 @@
 axis2_soap_fault_get_soap_version(axis2_soap_fault_t *fault,
                                   axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(fault)->soap_version;
 }
                                   
@@ -735,7 +735,7 @@
     axis2_qname_t *qn = NULL;
     axis2_char_t *excep = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(fault, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     detail = axis2_soap_fault_get_detail(fault, env);
     if(!detail)
         return NULL;
@@ -766,7 +766,7 @@
     axis2_soap_fault_detail_t *detail = NULL;
     axis2_om_node_t *fault_detail_entry_node = NULL;
     axis2_om_element_t *fault_detail_ele = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, exception, AXIS2_FAILURE);
     fault_impl = AXIS2_INTF_TO_IMPL(fault);
     detail = axis2_soap_fault_get_detail(fault, env);

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_code.c Thu Feb  9 22:48:20 2006
@@ -207,7 +207,7 @@
                            axis2_env_t **env)
 {
     axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
     if(fault_code_impl->subcode)
     {
@@ -236,7 +236,7 @@
 {
     axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
     
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, fault_val, AXIS2_FAILURE);
     
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
@@ -270,7 +270,7 @@
                                   axis2_soap_fault_sub_code_t *fault_subcode)
 {
     axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, fault_subcode, AXIS2_FAILURE);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
    /* 
@@ -303,7 +303,7 @@
 {
     axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
     
     if(fault_code_impl->subcode)
@@ -348,7 +348,7 @@
     axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
     
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
     
     if(fault_code_impl->value)
@@ -393,7 +393,7 @@
                                     axis2_om_node_t *node)
 {
    axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
-   AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
    fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
    
@@ -411,7 +411,7 @@
 axis2_soap_fault_code_get_base_node(axis2_soap_fault_code_t *fault_code,
                                     axis2_env_t **env)
 {
-   AXIS2_FUNC_PARAM_CHECK(fault_code, env, NULL);
+   AXIS2_ENV_CHECK(env, NULL);
    return AXIS2_INTF_TO_IMPL(fault_code)->om_ele_node;
 }
  
@@ -420,7 +420,7 @@
                                   axis2_env_t **env,
                                   int soap_version)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_version, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(fault_code)->soap_version = soap_version;
     return AXIS2_SUCCESS;
@@ -430,7 +430,7 @@
 axis2_soap_fault_code_get_soap_version(axis2_soap_fault_code_t *fault_code,
                                   axis2_env_t **env)
 {
-     AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
      return AXIS2_INTF_TO_IMPL(fault_code)->soap_version;
 } 
 
@@ -440,7 +440,7 @@
                                   axis2_soap_builder_t *soap_builder)
 {
     axis2_soap_fault_code_impl_t *fault_code_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_code, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_builder, AXIS2_FAILURE);
     fault_code_impl = AXIS2_INTF_TO_IMPL(fault_code);
     fault_code_impl->builder = soap_builder;

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_detail.c Thu Feb  9 22:48:20 2006
@@ -188,7 +188,7 @@
 axis2_soap_fault_detail_free(axis2_soap_fault_detail_t *fault_detail,
                              axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault_detail, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(fault_detail->ops)
     {
         AXIS2_FREE((*env)->allocator, fault_detail->ops);
@@ -206,7 +206,7 @@
                          axis2_om_node_t *node)
 {
     axis2_soap_fault_detail_impl_t *fault_detail_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_detail, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
     fault_detail_impl = AXIS2_INTF_TO_IMPL(fault_detail);
         
@@ -227,7 +227,7 @@
                          axis2_env_t **env)
 {
     axis2_soap_fault_detail_impl_t *fault_detail_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_detail, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_detail_impl = AXIS2_INTF_TO_IMPL(fault_detail);
     
     return AXIS2_OM_ELEMENT_GET_CHILDREN(fault_detail_impl->om_ele, env,
@@ -242,7 +242,7 @@
                          axis2_om_node_t *node)
 {
    axis2_soap_fault_detail_impl_t *fault_detail_impl = NULL;
-   AXIS2_FUNC_PARAM_CHECK(fault_detail, env, AXIS2_FAILURE);
+   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
    fault_detail_impl = AXIS2_INTF_TO_IMPL(fault_detail);
    
@@ -261,7 +261,7 @@
                         (axis2_soap_fault_detail_t *fault_detail,
                          axis2_env_t **env)
 {
-   AXIS2_FUNC_PARAM_CHECK(fault_detail, env, NULL);
+   AXIS2_ENV_CHECK(env, NULL);
    return AXIS2_INTF_TO_IMPL(fault_detail)->om_ele_node;
 }
 
@@ -270,7 +270,7 @@
                         (axis2_soap_fault_detail_t *fault_detail,
                          axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault_detail, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(fault_detail)->soap_version;
 }
                             
@@ -280,7 +280,7 @@
                          axis2_env_t **env,
                          int soap_version)
 {
-     AXIS2_FUNC_PARAM_CHECK(fault_detail, env, AXIS2_FAILURE);
+     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
      AXIS2_PARAM_CHECK((*env)->error, soap_version, AXIS2_FAILURE);
      AXIS2_INTF_TO_IMPL(fault_detail)->soap_version = soap_version;
      return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_node.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_node.c Thu Feb  9 22:48:20 2006
@@ -172,7 +172,7 @@
 axis2_soap_fault_node_free(axis2_soap_fault_node_t *fault_node,
                            axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault_node, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if(fault_node->ops)
     {
         AXIS2_FREE((*env)->allocator, fault_node->ops);
@@ -189,7 +189,7 @@
                            axis2_char_t *uri)
 {
     axis2_soap_fault_node_impl_t *fault_node_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_node, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, uri, AXIS2_FAILURE);
     fault_node_impl = AXIS2_INTF_TO_IMPL(fault_node);
     return AXIS2_OM_ELEMENT_SET_TEXT(fault_node_impl->om_ele,
@@ -202,7 +202,7 @@
                            axis2_env_t **env)
 {
     axis2_soap_fault_node_impl_t *fault_node_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_node, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_node_impl = AXIS2_INTF_TO_IMPL(fault_node);
     return AXIS2_OM_ELEMENT_GET_TEXT(fault_node_impl->om_ele,
                 env, fault_node_impl->om_ele_node);
@@ -236,7 +236,7 @@
                            axis2_env_t **env)
 {
     axis2_soap_fault_node_impl_t* fault_node_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_node, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     fault_node_impl = AXIS2_INTF_TO_IMPL(fault_node); 
     return fault_node_impl->om_ele_node;
 }
@@ -246,7 +246,7 @@
                            axis2_env_t **env)
 {
     axis2_soap_fault_node_impl_t* fault_node_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_node, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     fault_node_impl = AXIS2_INTF_TO_IMPL(fault_node); 
     return fault_node_impl->soap_version;
 }
@@ -258,7 +258,7 @@
                            int soap_version)
 {
     axis2_soap_fault_node_impl_t* fault_node_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_node, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_version, AXIS2_FAILURE);
     fault_node_impl = AXIS2_INTF_TO_IMPL(fault_node);
     fault_node_impl->soap_version = soap_version;

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c?rev=376579&r1=376578&r2=376579&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_reason.c Thu Feb  9 22:48:20 2006
@@ -190,7 +190,7 @@
                                   axis2_env_t **env)
 {
     axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
     
     if(fault_reason_impl->text)
@@ -215,7 +215,7 @@
                                  axis2_soap_fault_text_t *soap_text)
 {
     axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
-    AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_text, AXIS2_FAILURE);
     fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
     /*
@@ -246,7 +246,7 @@
 {
     axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
     int status = AXIS2_SUCCESS;
-    AXIS2_FUNC_PARAM_CHECK(fault_reason, env, NULL);
+    AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, fault_reason, NULL);
     fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
     
@@ -289,7 +289,7 @@
                                  axis2_om_node_t *node)
 {
    axis2_soap_fault_reason_impl_t *fault_reason_impl = NULL;
-   AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
+   AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    AXIS2_PARAM_CHECK((*env)->error, node, AXIS2_FAILURE);
    fault_reason_impl = AXIS2_INTF_TO_IMPL(fault_reason);
    if(AXIS2_OM_NODE_GET_NODE_TYPE(node, env) != AXIS2_OM_ELEMENT)
@@ -306,7 +306,7 @@
                                 (axis2_soap_fault_reason_t *fault_reason,
                                  axis2_env_t **env)
 {
-     AXIS2_FUNC_PARAM_CHECK(fault_reason, env, NULL);
+     AXIS2_ENV_CHECK(env, NULL);
      return AXIS2_INTF_TO_IMPL(fault_reason)->om_ele_node;
 
 
@@ -318,7 +318,7 @@
                                 (axis2_soap_fault_reason_t *fault_reason,
                                  axis2_env_t **env)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     return AXIS2_INTF_TO_IMPL(fault_reason)->soap_version;
 }
                             
@@ -328,7 +328,7 @@
                                  axis2_env_t **env,
                                  int soap_version)
 {
-    AXIS2_FUNC_PARAM_CHECK(fault_reason, env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, soap_version, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(fault_reason)->soap_version = soap_version;
     return AXIS2_SUCCESS;