Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 68954 invoked from network); 18 Mar 2008 09:04:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Mar 2008 09:04:58 -0000 Received: (qmail 69652 invoked by uid 500); 18 Mar 2008 09:04:55 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 69538 invoked by uid 500); 18 Mar 2008 09:04:55 -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 69527 invoked by uid 500); 18 Mar 2008 09:04:55 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 69524 invoked by uid 99); 18 Mar 2008 09:04:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2008 02:04:55 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Tue, 18 Mar 2008 09:04:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2AA491A9832; Tue, 18 Mar 2008 02:04:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r638273 - /webservices/axis2/trunk/c/util/src/http_chunked_stream.c Date: Tue, 18 Mar 2008 09:04:32 -0000 To: axis2-cvs@ws.apache.org From: pini@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080318090433.2AA491A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pini Date: Tue Mar 18 02:04:27 2008 New Revision: 638273 URL: http://svn.apache.org/viewvc?rev=638273&view=rev Log: Cleaned up the code and added relevant log messages Modified: webservices/axis2/trunk/c/util/src/http_chunked_stream.c Modified: webservices/axis2/trunk/c/util/src/http_chunked_stream.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/http_chunked_stream.c?rev=638273&r1=638272&r2=638273&view=diff ============================================================================== --- webservices/axis2/trunk/c/util/src/http_chunked_stream.c (original) +++ webservices/axis2/trunk/c/util/src/http_chunked_stream.c Tue Mar 18 02:04:27 2008 @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -34,12 +33,12 @@ static axis2_status_t axutil_http_chunked_stream_start_chunk( axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env); + const axutil_env_t *env); AXIS2_EXTERN axutil_http_chunked_stream_t *AXIS2_CALL axutil_http_chunked_stream_create( - const axutil_env_t * env, - axutil_stream_t * stream) + const axutil_env_t *env, + axutil_stream_t *stream) { axutil_http_chunked_stream_t *chunked_stream = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -51,6 +50,7 @@ if (!chunked_stream) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); + AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Not enough memory"); return NULL; } chunked_stream->stream = stream; @@ -64,8 +64,8 @@ AXIS2_EXTERN void AXIS2_CALL axutil_http_chunked_stream_free( - axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env) + axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env) { AXIS2_ENV_CHECK(env, void); @@ -75,15 +75,14 @@ AXIS2_EXTERN int AXIS2_CALL axutil_http_chunked_stream_read( - axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env, + axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env, void *buffer, size_t count) { int len = -1; int yet_to_read = 0; axutil_stream_t *stream = chunked_stream->stream; - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if (!buffer) { @@ -92,7 +91,7 @@ if (!stream) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM, - AXIS2_FAILURE); + AXIS2_FAILURE); return -1; } if (AXIS2_TRUE == chunked_stream->end_of_chunks) @@ -110,8 +109,8 @@ if (chunked_stream->unread_len < yet_to_read) { len = axutil_stream_read(chunked_stream->stream, env, - (axis2_char_t *) buffer + count - - yet_to_read, chunked_stream->unread_len); + (axis2_char_t *) buffer + count - + yet_to_read, chunked_stream->unread_len); yet_to_read -= len; chunked_stream->unread_len -= len; if (chunked_stream->unread_len <= 0) @@ -122,8 +121,8 @@ else { len = axutil_stream_read(chunked_stream->stream, env, - (axis2_char_t *) buffer + count - - yet_to_read, yet_to_read); + (axis2_char_t *) buffer + count - + yet_to_read, yet_to_read); yet_to_read -= len; chunked_stream->unread_len -= len; } @@ -134,15 +133,14 @@ AXIS2_EXTERN int AXIS2_CALL axutil_http_chunked_stream_write( - axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env, + axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env, const void *buffer, size_t count) { axutil_stream_t *stream = chunked_stream->stream; int len = -1; axis2_char_t tmp_buf[10]; - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); if (!buffer) { @@ -151,7 +149,7 @@ if (!stream) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM, - AXIS2_FAILURE); + AXIS2_FAILURE); return -1; } sprintf(tmp_buf, "%x%s", (unsigned int) count, AXIS2_HTTP_CRLF); @@ -163,22 +161,21 @@ AXIS2_EXTERN int AXIS2_CALL axutil_http_chunked_stream_get_current_chunk_size( - const axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env) + const axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env) { return chunked_stream->current_chunk_size; } static axis2_status_t axutil_http_chunked_stream_start_chunk( - axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env) + axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env) { axis2_char_t tmp_buf[3] = ""; axis2_char_t str_chunk_len[512] = ""; axis2_char_t *tmp = NULL; int read = -1; - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); /* remove the last CRLF of the previous chunk if any */ if (AXIS2_TRUE == chunked_stream->chunk_started) @@ -221,11 +218,10 @@ AXIS2_EXTERN axis2_status_t AXIS2_CALL axutil_http_chunked_stream_write_last_chunk( - axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env) + axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env) { axutil_stream_t *stream = NULL; - AXIS2_ENV_CHECK(env, AXIS2_FAILURE); stream = chunked_stream->stream; if (axutil_stream_write(stream, env, "0\r\n\r\n", 5) == 5) @@ -237,8 +233,9 @@ AXIS2_EXTERN axis2_bool_t AXIS2_CALL axutil_http_chunked_stream_get_end_of_chunks( - axutil_http_chunked_stream_t * chunked_stream, - const axutil_env_t * env) + axutil_http_chunked_stream_t *chunked_stream, + const axutil_env_t *env) { return chunked_stream->end_of_chunks; } + --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org