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 ma...@apache.org on 2008/02/18 06:08:31 UTC

svn commit: r628621 - in /webservices/axis2/trunk/c/util: include/axutil_http_chunked_stream.h src/http_chunked_stream.c

Author: manjula
Date: Sun Feb 17 21:08:30 2008
New Revision: 628621

URL: http://svn.apache.org/viewvc?rev=628621&view=rev
Log:
anging axis2_chunked_stream to axutil_chunked_stream.

Modified:
    webservices/axis2/trunk/c/util/include/axutil_http_chunked_stream.h
    webservices/axis2/trunk/c/util/src/http_chunked_stream.c

Modified: webservices/axis2/trunk/c/util/include/axutil_http_chunked_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_http_chunked_stream.h?rev=628621&r1=628620&r2=628621&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_http_chunked_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_http_chunked_stream.h Sun Feb 17 21:08:30 2008
@@ -16,8 +16,8 @@
 * limitations under the License.
 */
 
-#ifndef AXIS2_HTTP_CHUNKED_STREAM_H
-#define AXIS2_HTTP_CHUNKED_STREAM_H
+#ifndef AXUTIL_HTTP_CHUNKED_STREAM_H
+#define AXUTIL_HTTP_CHUNKED_STREAM_H
 
 /**
  * @defgroup axutil_http_chunked_stream http chunked stream
@@ -27,7 +27,7 @@
  */
 
 /**
- * @file axis2_http_chunked_stream.h
+ * @file axutil_http_chunked_stream.h
  * @brief axis2 HTTP Chunked Stream
  */
 
@@ -39,8 +39,8 @@
 {
 #endif
 
-    /** Type name for struct axis2_http_chunked_stream */
-    typedef struct axis2_http_chunked_stream axis2_http_chunked_stream_t;
+    /** Type name for struct axutil_http_chunked_stream */
+    typedef struct axutil_http_chunked_stream axutil_http_chunked_stream_t;
 
     struct axis2_callback_info
     {
@@ -48,7 +48,7 @@
         void *in_stream;
         int content_length;
         int unread_len;
-        axis2_http_chunked_stream_t *chunked_stream;
+        axutil_http_chunked_stream_t *chunked_stream;
     };
     typedef struct axis2_callback_info axis2_callback_info_t;
 
@@ -60,8 +60,8 @@
     * @param count
     */
     AXIS2_EXTERN int AXIS2_CALL
-    axis2_http_chunked_stream_read(
-        axis2_http_chunked_stream_t * chunked_stream,
+    axutil_http_chunked_stream_read(
+        axutil_http_chunked_stream_t * chunked_stream,
         const axutil_env_t * env,
         void *buffer,
         size_t count);
@@ -72,8 +72,8 @@
     * @param count
     */
     AXIS2_EXTERN int AXIS2_CALL
-    axis2_http_chunked_stream_write(
-        axis2_http_chunked_stream_t * chunked_stream,
+    axutil_http_chunked_stream_write(
+        axutil_http_chunked_stream_t * chunked_stream,
         const axutil_env_t * env,
         const void *buffer,
         size_t count);
@@ -84,8 +84,8 @@
     */
     AXIS2_EXTERN int AXIS2_CALL
 
-    axis2_http_chunked_stream_get_current_chunk_size(
-        const axis2_http_chunked_stream_t * chunked_stream,
+    axutil_http_chunked_stream_get_current_chunk_size(
+        const axutil_http_chunked_stream_t * chunked_stream,
         const axutil_env_t * env);
 
     /**
@@ -95,8 +95,8 @@
     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
 
-    axis2_http_chunked_stream_write_last_chunk(
-        axis2_http_chunked_stream_t * chunked_stream,
+    axutil_http_chunked_stream_write_last_chunk(
+        axutil_http_chunked_stream_t * chunked_stream,
         const axutil_env_t * env);
 
     /**
@@ -105,23 +105,23 @@
     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
     */
     AXIS2_EXTERN void AXIS2_CALL
-    axis2_http_chunked_stream_free(
-        axis2_http_chunked_stream_t * chunked_stream,
+    axutil_http_chunked_stream_free(
+        axutil_http_chunked_stream_t * chunked_stream,
         const axutil_env_t * env);
 
     /**
      * @param env pointer to environment struct
      * @param stream pointer to stream
      */
-    AXIS2_EXTERN axis2_http_chunked_stream_t *AXIS2_CALL
+    AXIS2_EXTERN axutil_http_chunked_stream_t *AXIS2_CALL
 
-    axis2_http_chunked_stream_create(
+    axutil_http_chunked_stream_create(
         const axutil_env_t * env,
         axutil_stream_t * stream);
 
     AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-    axis2_http_chunked_stream_get_end_of_chunks(
-        axis2_http_chunked_stream_t * chunked_stream,
+    axutil_http_chunked_stream_get_end_of_chunks(
+        axutil_http_chunked_stream_t * chunked_stream,
         const axutil_env_t * env);
     
 
@@ -129,4 +129,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif                          /* AXIS2_HTTP_CHUNKED_STREAM_H */
+#endif                          /* AXUTIL_HTTP_CHUNKED_STREAM_H */

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=628621&r1=628620&r2=628621&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/util/src/http_chunked_stream.c Sun Feb 17 21:08:30 2008
@@ -23,7 +23,7 @@
 
 #define AXIS2_HTTP_CRLF "\r\n"
 
-struct axis2_http_chunked_stream
+struct axutil_http_chunked_stream
 {
     axutil_stream_t *stream;
     int current_chunk_size;
@@ -32,21 +32,21 @@
     axis2_bool_t chunk_started;
 };
 
-static axis2_status_t axis2_http_chunked_stream_start_chunk(
-    axis2_http_chunked_stream_t * chunked_stream,
+static axis2_status_t axutil_http_chunked_stream_start_chunk(
+    axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env);
 
-AXIS2_EXTERN axis2_http_chunked_stream_t *AXIS2_CALL
-axis2_http_chunked_stream_create(
+AXIS2_EXTERN axutil_http_chunked_stream_t *AXIS2_CALL
+axutil_http_chunked_stream_create(
     const axutil_env_t * env,
     axutil_stream_t * stream)
 {
-    axis2_http_chunked_stream_t *chunked_stream = NULL;
+    axutil_http_chunked_stream_t *chunked_stream = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, stream, NULL);
 
-    chunked_stream = (axis2_http_chunked_stream_t *) AXIS2_MALLOC
-        (env->allocator, sizeof(axis2_http_chunked_stream_t));
+    chunked_stream = (axutil_http_chunked_stream_t *) AXIS2_MALLOC
+        (env->allocator, sizeof(axutil_http_chunked_stream_t));
 
     if (!chunked_stream)
     {
@@ -63,8 +63,8 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL
-axis2_http_chunked_stream_free(
-    axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_free(
+    axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env)
 {
     AXIS2_ENV_CHECK(env, void);
@@ -74,8 +74,8 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_http_chunked_stream_read(
-    axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_read(
+    axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env,
     void *buffer,
     size_t count)
@@ -101,7 +101,7 @@
     }
     if (AXIS2_FALSE == chunked_stream->chunk_started)
     {
-        axis2_http_chunked_stream_start_chunk(chunked_stream, env);
+        axutil_http_chunked_stream_start_chunk(chunked_stream, env);
     }
     yet_to_read = (int)count;
     /* We are sure that the difference lies within the int range */
@@ -116,7 +116,7 @@
             chunked_stream->unread_len -= len;
             if (chunked_stream->unread_len <= 0)
             {
-                axis2_http_chunked_stream_start_chunk(chunked_stream, env);
+                axutil_http_chunked_stream_start_chunk(chunked_stream, env);
             }
         }
         else
@@ -133,8 +133,8 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_http_chunked_stream_write(
-    axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_write(
+    axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env,
     const void *buffer,
     size_t count)
@@ -162,16 +162,16 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL
-axis2_http_chunked_stream_get_current_chunk_size(
-    const axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_get_current_chunk_size(
+    const axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env)
 {
     return chunked_stream->current_chunk_size;
 }
 
 static axis2_status_t
-axis2_http_chunked_stream_start_chunk(
-    axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_start_chunk(
+    axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env)
 {
     axis2_char_t tmp_buf[3] = "";
@@ -220,8 +220,8 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_http_chunked_stream_write_last_chunk(
-    axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_write_last_chunk(
+    axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t * env)
 {
     axutil_stream_t *stream = NULL;
@@ -236,8 +236,8 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_http_chunked_stream_get_end_of_chunks(
-    axis2_http_chunked_stream_t * chunked_stream,
+axutil_http_chunked_stream_get_end_of_chunks(
+    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