Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 15779 invoked from network); 2 Apr 2007 01:22:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2007 01:22:29 -0000 Received: (qmail 3013 invoked by uid 500); 2 Apr 2007 01:22:36 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 2792 invoked by uid 500); 2 Apr 2007 01:22:35 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 2781 invoked by uid 500); 2 Apr 2007 01:22:35 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 2778 invoked by uid 99); 2 Apr 2007 01:22:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 18:22:35 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Apr 2007 18:22:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2D5B91A9838; Sun, 1 Apr 2007 18:22:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524710 - in /webservices/axis2/trunk/c: include/axis2_http_request_line.h modules/core/transport/http/common/http_simple_request.c modules/core/transport/http/common/http_worker.c modules/core/transport/http/sender/http_client.c Date: Mon, 02 Apr 2007 01:22:07 -0000 To: axis2-cvs@ws.apache.org From: samisa@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070402012207.2D5B91A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: samisa Date: Sun Apr 1 18:22:06 2007 New Revision: 524710 URL: http://svn.apache.org/viewvc?view=rev&rev=524710 Log: Removed macros form http_request_line Modified: webservices/axis2/trunk/c/include/axis2_http_request_line.h webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Modified: webservices/axis2/trunk/c/include/axis2_http_request_line.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_request_line.h?view=diff&rev=524710&r1=524709&r2=524710 ============================================================================== --- webservices/axis2/trunk/c/include/axis2_http_request_line.h (original) +++ webservices/axis2/trunk/c/include/axis2_http_request_line.h Sun Apr 1 18:22:06 2007 @@ -103,25 +103,6 @@ axis2_http_request_line_parse_line(const axutil_env_t *env, const axis2_char_t *str); -/** Get method. */ -#define AXIS2_HTTP_REQUEST_LINE_GET_METHOD(request_line, env) \ - axis2_http_request_line_get_method (request_line, env) - -/** Gets the http version. */ -#define AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(request_line, env) \ - axis2_http_request_line_get_http_version(request_line, env) - -/** Gets the uri. */ -#define AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env) \ - axis2_http_request_line_get_uri (request_line, env) - -/** To string. */ -#define AXIS2_HTTP_REQUEST_LINE_TO_STRING(request_line, env) \ - axis2_http_request_line_to_string (request_line, env) - -/** Frees the http request line. */ -#define AXIS2_HTTP_REQUEST_LINE_FREE(request_line, env) \ - axis2_http_request_line_free(request_line, env) /** @} */ #ifdef __cplusplus Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c?view=diff&rev=524710&r1=524709&r2=524710 ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c Sun Apr 1 18:22:06 2007 @@ -101,7 +101,7 @@ */ if (simple_request->request_line) { - AXIS2_HTTP_REQUEST_LINE_FREE(simple_request->request_line, env); + axis2_http_request_line_free(simple_request->request_line, env); } if (simple_request->header_group) { Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=524710&r1=524709&r2=524710 ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Sun Apr 1 18:22:06 2007 @@ -143,7 +143,7 @@ content_length = AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request , env); - http_version = AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION + http_version = axis2_http_request_line_get_http_version (AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE (simple_request, env), env); if (! http_version) @@ -167,7 +167,7 @@ (encoding_header_value, AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))) { - if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD( + if (0 == axis2_strcasecmp(axis2_http_request_line_get_method( AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE( simple_request, env), env), AXIS2_HTTP_HEADER_POST)) { @@ -209,7 +209,7 @@ axis2_msg_ctx_set_property (msg_ctx, env, AXIS2_SVR_PEER_IP_ADDR, peer_property); } - path = AXIS2_HTTP_REQUEST_LINE_GET_URI( + path = axis2_http_request_line_get_uri( AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE( simple_request, env), env); @@ -244,7 +244,7 @@ env); soap_action_str = axutil_string_create(env, soap_action); } - if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD( + if (0 == axis2_strcasecmp(axis2_http_request_line_get_method( AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE( simple_request, env), env), AXIS2_HTTP_HEADER_GET)) { @@ -255,7 +255,7 @@ axutil_url_to_external_form(request_url, env), conf_ctx, axis2_http_transport_utils_get_request_params(env, - AXIS2_HTTP_REQUEST_LINE_GET_URI( + axis2_http_request_line_get_uri( AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE( simple_request, env), env))); if (AXIS2_FALSE == processed) @@ -292,7 +292,7 @@ return AXIS2_TRUE; } } - else if (0 == axis2_strcasecmp(AXIS2_HTTP_REQUEST_LINE_GET_METHOD( + else if (0 == axis2_strcasecmp(axis2_http_request_line_get_method( AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE( simple_request, env), env), AXIS2_HTTP_HEADER_POST)) { @@ -330,13 +330,13 @@ if (!http_error_value) { sprintf(status_line_str, "%s 500 Internal Server Error\r\n", - AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(req_line, + axis2_http_request_line_get_http_version(req_line, env)); } else { sprintf(status_line_str, "%s %s", - AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(req_line,env), + axis2_http_request_line_get_http_version(req_line,env), http_error_value); } } Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=524710&r1=524709&r2=524710 ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Sun Apr 1 18:22:06 2007 @@ -263,7 +263,7 @@ } if (AXIS2_FALSE == client->proxy_enabled) { - str_request_line = AXIS2_HTTP_REQUEST_LINE_TO_STRING( + str_request_line = axis2_http_request_line_to_string( AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(request, env) , env); } @@ -276,7 +276,7 @@ axis2_char_t *server = axutil_url_get_server(client->url, env); axis2_http_request_line_t *request_line = AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(request, env); - axis2_char_t *path = AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env); + axis2_char_t *path = axis2_http_request_line_get_uri(request_line, env); /* length = len(server) + len(:port) + len("http://") + len(path) + 1*/ @@ -292,8 +292,8 @@ str_request_line = AXIS2_MALLOC(env->allocator, axis2_strlen(host_port_str) + 20 * sizeof(axis2_char_t)); sprintf(str_request_line, "%s %s %s\r\n", - AXIS2_HTTP_REQUEST_LINE_GET_METHOD(request_line, env), - host_port_str, AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION( + axis2_http_request_line_get_method(request_line, env), + host_port_str, axis2_http_request_line_get_http_version( request_line, env)); AXIS2_FREE(env->allocator, host_port_str); host_port_str = NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org