You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2007/03/27 12:01:26 UTC

svn commit: r522850 - in /webservices/axis2/trunk/c: ./ axiom/include/ axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ include/ modules/core/context/ modules/core/transport/http/common/ modules/core/transport/http/receiver/ modules/core/...

Author: samisa
Date: Tue Mar 27 03:01:22 2007
New Revision: 522850

URL: http://svn.apache.org/viewvc?view=rev&rev=522850
Log:
Fixed Linux buld breaks

Modified:
    webservices/axis2/trunk/c/autogen.sh
    webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h
    webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h
    webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
    webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
    webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
    webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
    webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
    webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_document.c
    webservices/axis2/trunk/c/axiom/src/om/om_element.c
    webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
    webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
    webservices/axis2/trunk/c/build.sh
    webservices/axis2/trunk/c/include/axis2_handler.h
    webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
    webservices/axis2/trunk/c/include/axis2_http_response_writer.h
    webservices/axis2/trunk/c/include/axis2_http_svr_thread.h
    webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h
    webservices/axis2/trunk/c/include/axis2_transport_receiver.h
    webservices/axis2/trunk/c/include/axis2_transport_sender.h
    webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
    webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/util/src/hash.c

Modified: webservices/axis2/trunk/c/autogen.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/autogen.sh?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/autogen.sh (original)
+++ webservices/axis2/trunk/c/autogen.sh Tue Mar 27 03:01:22 2007
@@ -1,65 +1,65 @@
-#!/bin/bash
-echo 'Running autogen.sh in Util'
-cd util
-./autogen.sh
-
-echo 'Running autogen.sh in Axiom'
-cd ../axiom
-./autogen.sh
-
-echo 'Running autogen.sh in Xml_schema'
-cd ../xml_schema
-./autogen.sh
-
-echo 'Running autogen.sh in Woden'
-cd ../woden
-./autogen.sh
-
-echo 'Running autogen.sh in Guththila'
-cd ../guththila
-./autogen.sh
-
-echo 'Running autogen.sh in Axis2/C'
-cd ..
-
-echo -n 'Running libtoolize...'
-if libtoolize --force > /dev/null 2>&1; then
-	echo 'done.'
-else
-	echo 'failed.'
-	exit 1
-fi
-
-echo -n 'Running aclocal...'
-if aclocal > /dev/null 2>&1; then
-	echo 'done.'
-else
-	echo 'failed.'
-	exit 1
-fi
-
-echo -n 'Running autoheader...'
-if autoheader > /dev/null 2>&1; then
-	echo 'done.'
-else
-	echo 'failed.'
-	exit 1
-fi
-
-echo -n 'Running autoconf...'
-if autoconf > /dev/null 2>&1; then
-	echo 'done.'
-else
-	echo 'failed.'
-	exit 1
-fi
-
-echo -n 'Running automake...'
-if automake --add-missing > /dev/null 2>&1; then
-	echo 'done.'
-else
-	echo 'failed.'
-	exit 1
-fi
-
-echo 'done'
+#!/bin/bash
+echo 'Running autogen.sh in Util'
+cd util
+sh autogen.sh
+
+echo 'Running autogen.sh in Axiom'
+cd ../axiom
+sh autogen.sh
+
+echo 'Running autogen.sh in Xml_schema'
+cd ../xml_schema
+sh autogen.sh
+
+echo 'Running autogen.sh in Woden'
+cd ../woden
+sh autogen.sh
+
+echo 'Running autogen.sh in Guththila'
+cd ../guththila
+sh autogen.sh
+
+echo 'Running autogen.sh in Axis2/C'
+cd ..
+
+echo -n 'Running libtoolize...'
+if libtoolize --force > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running aclocal...'
+if aclocal > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running autoheader...'
+if autoheader > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running autoconf...'
+if autoconf > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running automake...'
+if automake --add-missing > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo 'done'

Modified: webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h Tue Mar 27 03:01:22 2007
@@ -47,7 +47,7 @@
      */
     struct axiom_child_element_iterator_ops
     {
-        axis2_status_t(AXIS2_CALL *free_fn)
+        void (AXIS2_CALL *free_fn)
         (void *iterator,
                 const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h Tue Mar 27 03:01:22 2007
@@ -54,7 +54,7 @@
         /**
         * Free function free the om_children_with_specific_attribute_iterator struct
         */
-        axis2_status_t(AXIS2_CALL *
+        void (AXIS2_CALL *
                 free_fn)(axiom_children_with_specific_attribute_iterator_t *iterator,
                         const axis2_env_t *env);
 

Modified: webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h Tue Mar 27 03:01:22 2007
@@ -98,7 +98,7 @@
                     const axis2_env_t *env,
                     axis2_char_t* file_name);
 
-        axis2_status_t(AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(axiom_data_handler_t *data_handler,
                         const axis2_env_t *env);
     };

Modified: webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h Tue Mar 27 03:01:22 2007
@@ -68,10 +68,17 @@
         /** Deallocate memory
           * @return status code
           */
+<<<<<<< .mine
+        void (AXIS2_CALL *
+                free)(
+                    axiom_mime_parser_t *mime_parser,
+                    const axis2_env_t *env);
+=======
         void (AXIS2_CALL *
         free)(
                axiom_mime_parser_t *mime_parser,
                const axis2_env_t *env);
+>>>>>>> .r522846
 
         int (AXIS2_CALL *
         get_soap_body_len)(

Modified: webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_xml_writer.h Tue Mar 27 03:01:22 2007
@@ -58,7 +58,7 @@
 
         void (AXIS2_CALL *
         free)(axiom_xml_writer_t *writer,
-                        const axis2_env_t *env);
+            const axis2_env_t *env);
         /**
          *  Write a start tag to output stream with localname.
          *  Internally the writer keeps track of the opened tags 

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h Tue Mar 27 03:01:22 2007
@@ -72,7 +72,7 @@
    /** Deallocate memory
      * @return status code
      */
-    axis2_status_t (AXIS2_CALL *
+    void (AXIS2_CALL *
     free) (axiom_mime_body_part_t *mime_body_part, 
             const axis2_env_t *env);
 };

Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_output.h Tue Mar 27 03:01:22 2007
@@ -79,7 +79,7 @@
    /** Deallocate memory
      * @return status code
      */
-    axis2_status_t (AXIS2_CALL *free) (axiom_mime_output_t *mime_output,
+    void (AXIS2_CALL *free) (axiom_mime_output_t *mime_output,
                             const axis2_env_t *env);
 
 };

Modified: webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c Tue Mar 27 03:01:22 2007
@@ -118,7 +118,7 @@
         AXIS2_FREE(env->allocator, iterator_impl->iterator.ops);
 
     AXIS2_FREE(env->allocator, iterator_impl);
-    return AXIS2_SUCCESS;
+    return;
 }
 
 axis2_status_t AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Tue Mar 27 03:01:22 2007
@@ -142,7 +142,7 @@
         iterator->ops = NULL;
     }
     AXIS2_FREE(env->allocator, qname_iter_impl);
-    return AXIS2_SUCCESS;
+    return;
 }
 
 axis2_status_t AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/om/om_document.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_document.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_document.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_document.c Tue Mar 27 03:01:22 2007
@@ -151,8 +151,6 @@
     const axis2_env_t *env,
     axiom_node_t *node)
 {
-    int status = AXIS2_SUCCESS;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, node, AXIS2_FAILURE);
 

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Tue Mar 27 03:01:22 2007
@@ -368,8 +368,7 @@
         key = AXIS2_MALLOC(env->allocator, sizeof(char) * 10);
         memset(key, 0, sizeof(char)*10);
         om_element->next_ns_prefix_number++;
-        /*sprintf(key, "axis2ns%d", om_element->next_ns_prefix_number);*/
-        sprintf(key, "");
+        key[0] = '\0';
         axis2_hash_set(om_element->namespaces, key,
             AXIS2_HASH_KEY_STRING, ns);
     }
@@ -431,8 +430,7 @@
         key = AXIS2_MALLOC(env->allocator, sizeof(char) * 10);
         memset(key, 0, sizeof(char)*10);
         om_element->next_ns_prefix_number++;
-        /*sprintf(key, "axis2ns%d", om_element->next_ns_prefix_number);*/
-        sprintf(key, "");
+        key[0] = '\0';
         axis2_hash_set(om_element->namespaces, key,
             AXIS2_HASH_KEY_STRING,  ns);
     }
@@ -607,7 +605,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (!om_element)
     {
-        return AXIS2_FAILURE;
+        return;
     }
 
     if (om_element->localname)

Modified: webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_namespace.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_namespace.c Tue Mar 27 03:01:22 2007
@@ -88,7 +88,7 @@
 
     if (--om_namespace->ref > 0)
     {
-        return AXIS2_SUCCESS;
+        return;
     }
 
     if (om_namespace->prefix)

Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Tue Mar 27 03:01:22 2007
@@ -756,7 +756,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (!om_builder)
     {
-        return AXIS2_FAILURE;
+        return;
     }
 
     if (om_builder->parser)
@@ -785,7 +785,7 @@
         }
     }
     AXIS2_FREE(env->allocator, om_builder);
-    return AXIS2_SUCCESS;
+    return;
 }
 
 AXIS2_EXTERN axiom_document_t* AXIS2_CALL

Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Tue Mar 27 03:01:22 2007
@@ -837,7 +837,7 @@
     const axis2_env_t *env,
     void *data)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, void);
     if(data)
         xmlFree(data);
     return;

Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build.sh?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Tue Mar 27 03:01:22 2007
@@ -1,19 +1,19 @@
 #!/bin/bash
 set -e
-./autogen.sh
+sh autogen.sh
 AXIS2C_HOME=${AXIS2C_HOME:=`pwd`/deploy}
 
 export AXIS2C_HOME
 
 echo "AXIS2C_HOME = ${AXIS2C_HOME}"
 
-./configure --prefix=${AXIS2C_HOME}
+sh configure --prefix=${AXIS2C_HOME}
 make 
 make install
 
 cd samples
-./autogen.sh
-./configure --prefix=${AXIS2C_HOME} 
+sh autogen.sh
+sh configure --prefix=${AXIS2C_HOME} 
 make 
 make install
 								

Modified: webservices/axis2/trunk/c/include/axis2_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler.h Tue Mar 27 03:01:22 2007
@@ -67,7 +67,7 @@
          * @param env pointer to environment struct
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
-        axis2_status_t (AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(
                     axis2_handler_t *handler,
                     const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h Tue Mar 27 03:01:22 2007
@@ -59,7 +59,7 @@
 			const axis2_env_t *env,
 			const axis2_char_t *encoding);
 
-		axis2_status_t (AXIS2_CALL *
+		void (AXIS2_CALL *
         free_function)(axis2_http_out_transport_info_t *info,
 			const axis2_env_t *env);
 	};
@@ -131,7 +131,7 @@
 	axis2_http_out_transport_info_set_free_func(
 		axis2_http_out_transport_info_t *out_transport_info,
 		const axis2_env_t *env,
-		axis2_status_t (AXIS2_CALL *free_function)(
+		void (AXIS2_CALL *free_function)(
 		axis2_http_out_transport_info_t *,
 		const axis2_env_t*));
 

Modified: webservices/axis2/trunk/c/include/axis2_http_response_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_response_writer.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_response_writer.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_response_writer.h Tue Mar 27 03:01:22 2007
@@ -159,7 +159,7 @@
          * @param env pointer to environment struct
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
-        axis2_status_t (AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(
                     axis2_http_response_writer_t *response_writer,
                     const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/include/axis2_http_svr_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_svr_thread.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_svr_thread.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_svr_thread.h Tue Mar 27 03:01:22 2007
@@ -103,7 +103,7 @@
          * @param svr_thread pointer to server thread
          * @param env pointer to environment struct
          */
-        axis2_status_t (AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(
                     axis2_http_svr_thread_t *svr_thread,
                     const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h (original)
+++ webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h Tue Mar 27 03:01:22 2007
@@ -169,7 +169,7 @@
          * @param env pointer to environment struct
          * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
-        axis2_status_t (AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(
                     axis2_simple_http_svr_conn_t *svr_conn,
                     const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/include/axis2_transport_receiver.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_receiver.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_receiver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_receiver.h Tue Mar 27 03:01:22 2007
@@ -70,7 +70,7 @@
     * @param transport_receiver pointer to transport receiver
     * @param env pointer to environment struct
         */
-        axis2_status_t (AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(
                     axis2_transport_receiver_t *transport_receiver,
                     const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/include/axis2_transport_sender.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_sender.h?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_sender.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_sender.h Tue Mar 27 03:01:22 2007
@@ -63,7 +63,7 @@
     * @param env pointer to environment struct
     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
          */
-        axis2_status_t (AXIS2_CALL *
+        void (AXIS2_CALL *
                 free)(
                     axis2_transport_sender_t *transport_sender,
                     const axis2_env_t *env);

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Tue Mar 27 03:01:22 2007
@@ -290,7 +290,7 @@
     AXIS2_ENV_CHECK(env, void);
 
     if (msg_ctx->paused || msg_ctx->keep_alive)
-        return AXIS2_SUCCESS;
+        return;
     
     if (msg_ctx->base)
     {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c Tue Mar 27 03:01:22 2007
@@ -196,7 +196,7 @@
 axis2_http_out_transport_info_set_free_func(
     axis2_http_out_transport_info_t *out_transport_info,
     const axis2_env_t *env,
-    axis2_status_t (AXIS2_CALL *free_function)(axis2_http_out_transport_info_t *,const axis2_env_t*)
+    void (AXIS2_CALL *free_function)(axis2_http_out_transport_info_t *,const axis2_env_t*)
     )
 {
 	out_transport_info->free_function = free_function;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Tue Mar 27 03:01:22 2007
@@ -331,10 +331,9 @@
     axis2_transport_receiver_t *inst,
     const axis2_env_t *env)
 {
-    axis2_status_t status = AXIS2_FAILURE;
     if (inst)
     {
-        status = AXIS2_TRANSPORT_RECEIVER_FREE(inst, env);
+        AXIS2_TRANSPORT_RECEIVER_FREE(inst, env);
     }
-    return status;
+    return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Tue Mar 27 03:01:22 2007
@@ -177,7 +177,7 @@
 
     AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(response_writer));
 
-    return AXIS2_SUCCESS;
+    return;
 }
 
 axis2_char_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Tue Mar 27 03:01:22 2007
@@ -663,12 +663,11 @@
     axis2_transport_sender_t *inst,
     const axis2_env_t *env)
 {
-    axis2_status_t status = AXIS2_FAILURE;
     if (inst)
     {
-        status = AXIS2_TRANSPORT_SENDER_FREE(inst, env);
+        AXIS2_TRANSPORT_SENDER_FREE(inst, env);
     }
-    return status;
+    return AXIS2_SUCCESS;
 }
 
 

Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?view=diff&rev=522850&r1=522849&r2=522850
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Tue Mar 27 03:01:22 2007
@@ -531,7 +531,7 @@
 static void
 axis2_hash_entry_free(const axis2_env_t *env, axis2_hash_entry_t *hash_entry)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, void);
     if (!hash_entry)
         return;
     if (hash_entry->next)



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org