axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r523894 - in /webservices/axis2/trunk/c: modules/core/transport/http/server/IIS/axis2_iis_stream.c modules/core/transport/http/server/apache2/apache2_stream.c util/include/axis2_stream.h util/src/stream.c
Date Fri, 30 Mar 2007 00:49:20 GMT
Author: samisa
Date: Thu Mar 29 17:49:19 2007
New Revision: 523894

URL: http://svn.apache.org/viewvc?view=rev&rev=523894
Log:
Fixed build break

Modified:
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
    webservices/axis2/trunk/c/util/include/axis2_stream.h
    webservices/axis2/trunk/c/util/src/stream.c

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c?view=diff&rev=523894&r1=523893&r2=523894
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_stream.c Thu
Mar 29 17:49:19 2007
@@ -91,9 +91,9 @@
     stream_impl->lpECB = lpECB;
     stream_impl->stream_type = AXIS2_STREAM_MANAGED;
 
-    axis2_stream_set_read(stream, env, iis_stream_read);
-    axis2_stream_set_write(stream, env, iis_stream_write);
-    axis2_stream_set_skip(stream, env, iis_stream_skip);
+    axis2_stream_set_read(stream_impl, env, iis_stream_read);
+    axis2_stream_set_write(stream_impl, env, iis_stream_write);
+    axis2_stream_set_skip(stream_impl, env, iis_stream_skip);
 
     return &(stream_impl->stream);
 }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c?view=diff&rev=523894&r1=523893&r2=523894
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
(original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_stream.c
Thu Mar 29 17:49:19 2007
@@ -20,18 +20,12 @@
 #include "apache2_stream.h"
 #include <http_protocol.h>
 
-/**
- * @brief Stream struct impl
- *   Streaming mechanisms for Apache2 web server
- */
-
 typedef struct apache2_stream_impl
 {
     axis2_stream_t stream;
     axis2_stream_type_t stream_type;
     request_rec *request;
-}
-apache2_stream_impl_t;
+}apache2_stream_impl_t;
 
 #define AXIS2_INTF_TO_IMPL(stream) ((apache2_stream_impl_t *)(stream))
 
@@ -65,10 +59,6 @@
     axis2_stream_t *stream,
     const axis2_env_t *env);
 
-/************************* End of function headers ****************************/
-/*
- * Internal function. Not exposed to outside
- */
 AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
 axis2_stream_create_apache2(
     const axis2_env_t *env,
@@ -90,9 +80,9 @@
     stream_impl->request = request;
     stream_impl->stream_type = AXIS2_STREAM_MANAGED;
 
-    axis2_stream_set_read(stream, env, apache2_stream_read);
-    axis2_stream_set_write(stream, env, apache2_stream_write);
-    axis2_stream_set_skip(stream, env, apache2_stream_skip);
+    axis2_stream_set_read(stream_impl, env, apache2_stream_read);
+    axis2_stream_set_write(stream_impl, env, apache2_stream_write);
+    axis2_stream_set_skip(stream_impl, env, apache2_stream_skip);
 
     return &(stream_impl->stream);
 }

Modified: webservices/axis2/trunk/c/util/include/axis2_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_stream.h?view=diff&rev=523894&r1=523893&r2=523894
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_stream.h Thu Mar 29 17:49:19 2007
@@ -27,10 +27,8 @@
 {
 #endif
 
-    typedef struct axis2_stream axis2_stream_t;
-    typedef struct axis2_stream_ops axis2_stream_ops_t;
-
 #define AXIS2_STREAM_DEFAULT_BUF_SIZE 2048
+
     /**
      * @defgroup axis2_stream stream
      * @ingroup axis2_util
@@ -52,6 +50,57 @@
     };
 
     typedef enum axis2_stream_type axis2_stream_type_t;
+    typedef struct axis2_stream axis2_stream_t;
+
+    struct axis2_stream
+    {
+        axis2_stream_type_t stream_type;
+        int len;
+        int max_len;
+        /* Only one of these is used for a perticlar
+         * instance depending on the type
+         */
+        axis2_char_t *buffer;
+        axis2_char_t *buffer_head;
+        FILE *fp;
+        int socket;
+
+        int axis2_eof;
+
+       /**
+        * reads from stream
+        * @param buffer buffer into which the content is to be read
+        * @param count size of the buffer
+        * @return no: of bytes read
+        */
+        int(AXIS2_CALL *
+        read)(axis2_stream_t *stream,
+            const axis2_env_t *env,
+            void *buffer,
+            size_t count);
+
+        /**
+         * writes into stream
+         * @param buffer buffer to be written
+         * @param count size of the buffer
+         * @return no: of bytes actually written
+         */
+        int(AXIS2_CALL *
+        write)(axis2_stream_t *stream,
+            const axis2_env_t *env,
+            const void *buffer,
+            size_t count);
+
+        /**
+        * Skips over and discards n bytes of data from this input stream.
+        * @param count number of bytes to be discarded
+        * @return no: of bytes actually skipped
+        */
+        int(AXIS2_CALL *
+        skip)(axis2_stream_t *stream,
+            const axis2_env_t *env,
+            int count);
+    };
 
    /**
     * Deletes the stream

Modified: webservices/axis2/trunk/c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stream.c?view=diff&rev=523894&r1=523893&r2=523894
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Thu Mar 29 17:49:19 2007
@@ -20,55 +20,6 @@
 #include <axis2_stream.h>
 #include <platforms/axis2_platform_auto_sense.h>
 
-struct axis2_stream
-{
-    axis2_stream_type_t stream_type;
-    int len;
-    int max_len;
-    /* Only one of these is used for a perticlar
-     * instance depending on the type
-     */
-    axis2_char_t *buffer;
-    axis2_char_t *buffer_head;
-    FILE *fp;
-    int socket;
-
-    int axis2_eof;
-
-   /**
-    * reads from stream
-    * @param buffer buffer into which the content is to be read
-    * @param count size of the buffer
-    * @return no: of bytes read
-    */
-    int(AXIS2_CALL *
-    read)(axis2_stream_t *stream,
-        const axis2_env_t *env,
-        void *buffer,
-        size_t count);
-
-    /**
-     * writes into stream
-     * @param buffer buffer to be written
-     * @param count size of the buffer
-     * @return no: of bytes actually written
-     */
-    int(AXIS2_CALL *
-    write)(axis2_stream_t *stream,
-        const axis2_env_t *env,
-        const void *buffer,
-        size_t count);
-
-    /**
-    * Skips over and discards n bytes of data from this input stream.
-    * @param count number of bytes to be discarded
-    * @return no: of bytes actually skipped
-    */
-    int(AXIS2_CALL *
-    skip)(axis2_stream_t *stream,
-        const axis2_env_t *env,
-        int count);
-};
 
 /** basic stream operatons **/
 int AXIS2_CALL



---------------------------------------------------------------------
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