[wsf-c-dev] svn commit r355 - wsf/php/src

[svn at wso2.com]

Author: nandika
Date: Mon Jan  8 02:16:04 2007
New Revision: 355

Modified:
   wsf/php/src/stream.c
   wsf/php/src/util.c
Log:
ws prefix changed to wsf

Modified: wsf/php/src/stream.c
==============================================================================
--- wsf/php/src/stream.c	(original)
+++ wsf/php/src/stream.c	Mon Jan  8 02:16:04 2007
@@ -21,9 +21,9 @@
 #include <SAPI.h>
 #include <php.h>
 
-typedef struct ws_stream_impl ws_stream_impl_t;
+typedef struct wsf_stream_impl wsf_stream_impl_t;
 
-struct ws_stream_impl{
+struct wsf_stream_impl{
     axis2_stream_t stream;
     axis2_stream_type_t stream_type;
     php_req_info_t *req_info;
@@ -32,34 +32,34 @@
     int buffer_len;
 };
 
-#define AXIS2_INTF_TO_IMPL(stream) ((ws_stream_impl_t *)(stream))
+#define AXIS2_INTF_TO_IMPL(stream) ((wsf_stream_impl_t *)(stream))
 
 axis2_status_t WSF_CALL 
-ws_stream_free (
+wsf_stream_free (
         axis2_stream_t *stream, 
         const axis2_env_t *env);
 
 axis2_stream_type_t WSF_CALL
-ws_stream_get_type(
+wsf_stream_get_type(
         axis2_stream_t *stream, 
         const axis2_env_t *env);
 
 int WSF_CALL
-ws_stream_write(
+wsf_stream_write(
         axis2_stream_t *stream, 
         const axis2_env_t *env, 
         const void *buffer, 
         size_t count);
         
 int WSF_CALL 
-ws_stream_read(
+wsf_stream_read(
         axis2_stream_t *stream, 
         const axis2_env_t *env, 
         void *buffer, 
         size_t count);
         
 int WSF_CALL 
-ws_stream_skip(
+wsf_stream_skip(
         axis2_stream_t *stream, 
         const axis2_env_t *env, 
         int count);
@@ -68,10 +68,10 @@
 axis2_stream_create_php(const axis2_env_t *env, 
         php_req_info_t *req_info TSRMLS_DC)
 {
-    ws_stream_impl_t *stream_impl = NULL;
+    wsf_stream_impl_t *stream_impl = NULL;
     
-    stream_impl = (ws_stream_impl_t *)AXIS2_MALLOC(env->allocator, 
-        sizeof(ws_stream_impl_t));
+    stream_impl = (wsf_stream_impl_t *)AXIS2_MALLOC(env->allocator, 
+        sizeof(wsf_stream_impl_t));
         
     if(!stream_impl)
     {
@@ -87,13 +87,12 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         AXIS2_FREE(env->allocator, stream_impl);
         return NULL;
-    
     }
     
-    stream_impl->stream.ops->free_fn = ws_stream_free;
-    stream_impl->stream.ops->read = ws_stream_read;
-    stream_impl->stream.ops->write = ws_stream_write;
-    stream_impl->stream.ops->skip = ws_stream_skip;
+    stream_impl->stream.ops->free_fn = wsf_stream_free;
+    stream_impl->stream.ops->read = wsf_stream_read;
+    stream_impl->stream.ops->write = wsf_stream_write;
+    stream_impl->stream.ops->skip = wsf_stream_skip;
     
     stream_impl->req_info = req_info;
     stream_impl->buffer = NULL;
@@ -109,11 +108,11 @@
 }
 
 axis2_status_t WSF_CALL 
-ws_stream_free (
+wsf_stream_free (
     axis2_stream_t *stream, 
     const axis2_env_t *env)
 {
-    ws_stream_impl_t *stream_impl = NULL;
+    wsf_stream_impl_t *stream_impl = NULL;
     stream_impl = AXIS2_INTF_TO_IMPL(stream);
     
     if(NULL != stream_impl->stream.ops){
@@ -130,7 +129,7 @@
 }
 
 axis2_stream_type_t WSF_CALL
-ws_stream_get_type (axis2_stream_t *stream, 
+wsf_stream_get_type (axis2_stream_t *stream, 
     const axis2_env_t *env)
 {
     
@@ -138,16 +137,16 @@
 }
 
 int WSF_CALL
-ws_stream_write(axis2_stream_t *stream, const axis2_env_t *env,const void *buf, size_t count){
+wsf_stream_write(axis2_stream_t *stream, const axis2_env_t *env,const void *buf, size_t count){
     return -1;    
 }
 int WSF_CALL 
-ws_stream_read(axis2_stream_t *stream, 
+wsf_stream_read(axis2_stream_t *stream, 
         const axis2_env_t *env, 
         void *buffer, 
         size_t count)
 {
-    ws_stream_impl_t *stream_impl = NULL;
+    wsf_stream_impl_t *stream_impl = NULL;
     int len = 0;
     stream_impl = AXIS2_INTF_TO_IMPL(stream);
     if(!buffer)
@@ -174,12 +173,12 @@
 }
 
 int WSF_CALL 
-ws_stream_skip(axis2_stream_t *stream, 
+wsf_stream_skip(axis2_stream_t *stream, 
     const axis2_env_t *env, 
     int count)
 {
     
-    ws_stream_impl_t *stream_impl = NULL;
+    wsf_stream_impl_t *stream_impl = NULL;
     stream_impl = AXIS2_INTF_TO_IMPL(stream);
     return -1;
 }

Modified: wsf/php/src/util.c
==============================================================================
--- wsf/php/src/util.c	(original)
+++ wsf/php/src/util.c	Mon Jan  8 02:16:04 2007
@@ -255,13 +255,14 @@
 	if(!impl_info_param)
 	{
 		return NULL;
-	}
+	}/*
 	AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
 	impl_info_param->ops->value_free = axis2_dll_desc_free_void_arg;
 
 	axis2_class_loader_init(env);
 	msg_recv = (axis2_msg_recv_t *) axis2_class_loader_create_dll(env, 
 		impl_info_param);
+	*/
 	return msg_recv;
 }