axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r643812 - in /webservices/axis2/trunk/c/src/core: deployment/desc_builder.c transport/http/common/http_worker.c
Date Wed, 02 Apr 2008 09:24:34 GMT
Author: nandika
Date: Wed Apr  2 02:24:31 2008
New Revision: 643812

URL: http://svn.apache.org/viewvc?rev=643812&view=rev
Log:
compiler errors fixed

Modified:
    webservices/axis2/trunk/c/src/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c

Modified: webservices/axis2/trunk/c/src/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/desc_builder.c?rev=643812&r1=643811&r2=643812&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/desc_builder.c Wed Apr  2 02:24:31 2008
@@ -174,10 +174,11 @@
     if (!reader)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_READER,
-                        AXIS2_FAILURE) return NULL;
+                        AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
             "Could not create xml reader for %s", desc_builder->file_name);
-    }
+		return NULL;
+    };
 
     /** create axiom_stax_builder by parsing pull_parser struct */
     desc_builder->builder = axiom_stax_builder_create(env, reader);
@@ -185,10 +186,11 @@
     if (!(desc_builder->builder))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_READER,
-                        AXIS2_FAILURE) return NULL;
+                        AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
             "Could not create xml stream reader for desc builder %s. Unable "\
                 "to continue", desc_builder->file_name);
+		 return NULL;
     }
 
     /**

Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c?rev=643812&r1=643811&r2=643812&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c Wed Apr  2 02:24:31
2008
@@ -155,6 +155,11 @@
     axis2_char_t *http_method = NULL;
     axis2_http_request_line_t *request_line = NULL;
 
+    axutil_hash_t *request_params = NULL;
+    axis2_char_t *request_uri = NULL;
+    axis2_char_t *url_ext_form = NULL;
+    const axis2_char_t *content_type = NULL;
+
     AXIS2_PARAM_CHECK(env->error, svr_conn, AXIS2_FALSE);
     AXIS2_PARAM_CHECK(env->error, simple_request, AXIS2_FALSE);
 
@@ -498,10 +503,7 @@
         is_put = AXIS2_TRUE;
     }
 
-    axutil_hash_t *request_params = NULL;
-    axis2_char_t *request_uri = NULL;
-    axis2_char_t *url_ext_form = NULL;
-    const axis2_char_t *content_type = NULL;
+
         
     request_uri = axis2_http_request_line_get_uri (request_line, env);
     request_params = 
@@ -1168,7 +1170,11 @@
             axutil_property_t *http_error_property = NULL;
             axis2_char_t *http_error_value = NULL;
             axis2_char_t *fault_code = NULL;
-            if (!engine)
+            int status_code = 0;
+            axis2_char_t *reason_phrase = NULL;
+            int stream_len = 0;
+
+			if (!engine)
             {
                 return AXIS2_FALSE;
             }
@@ -1226,9 +1232,7 @@
             {
                 axis2_engine_send_fault(engine, env, fault_ctx);
             }
-            int status_code = 0;
-            axis2_char_t *reason_phrase = NULL;
-            int stream_len = 0;
+            
             status_code = axis2_http_status_line_get_status_code(tmp_stat_line, env);
             reason_phrase = axis2_http_status_line_get_reason_phrase(tmp_stat_line, env);
 
@@ -1595,8 +1599,8 @@
                         }
                         while (size)
                         {
+							axis2_http_header_t *simple_header = NULL;
                             size--;
-                            axis2_http_header_t *simple_header = NULL;
                             simple_header = (axis2_http_header_t *) 
                                 axutil_array_list_get(output_header_list, 
                                                       env, size);
@@ -1608,9 +1612,9 @@
                         if (axis2_msg_ctx_get_status_code(out_msg_ctx, env))
                         {
                             int status_code = 0;
-                            status_code = 
-                                axis2_msg_ctx_get_status_code(out_msg_ctx, env);
-                            axis2_char_t *status_code_str = NULL;
+							axis2_char_t *status_code_str = NULL;
+                            status_code = axis2_msg_ctx_get_status_code(out_msg_ctx, env);
+                            
                             switch (status_code)
                             {
                             case AXIS2_HTTP_RESPONSE_CONTINUE_CODE_VAL:
@@ -1729,8 +1733,8 @@
 
                         while (size)
                         {
+							axis2_http_header_t *simeple_header = NULL;
                             size--;
-                            axis2_http_header_t *simeple_header = NULL;
                             simeple_header = (axis2_http_header_t *)
                                 axutil_array_list_get(output_header_list,
                                                       env, size);



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


Mime
View raw message