[wsf-c-dev] svn commit r351 - wsf/php/src
svn at wso2.com
svn at wso2.com
Mon Jan 8 01:00:25 PST 2007
Author: nandika
Date: Mon Jan 8 01:00:24 2007
New Revision: 351
Modified:
wsf/php/src/out_transport_info.c
wsf/php/src/worker.c
wsf/php/src/wsf_common.h
wsf/php/src/wsf_out_transport_info.h
Log:
prefixes corrected
Modified: wsf/php/src/out_transport_info.c
==============================================================================
--- wsf/php/src/out_transport_info.c (original)
+++ wsf/php/src/out_transport_info.c Mon Jan 8 01:00:24 2007
@@ -20,13 +20,12 @@
/**
- * @brief Apache2 Out transport info impl structure
- * Axis2 php_out_transport_info_impl
+ * @brief wsf_out_transport_info struct
*/
-typedef struct ws_out_transport_info_impl
- ws_out_transport_info_impl_t;
+typedef struct wsf_out_transport_info_impl
+ wsf_out_transport_info_impl_t;
-struct ws_out_transport_info_impl
+struct wsf_out_transport_info_impl
{
axis2_http_out_transport_info_t out_transport_info;
php_req_info_t *request;
@@ -34,38 +33,39 @@
};
#define AXIS2_INTF_TO_IMPL(out_transport_info) \
- ((ws_out_transport_info_impl_t *)(out_transport_info))
+ ((wsf_out_transport_info_impl_t *)(out_transport_info))
/***************************** Function headers *******************************/
axis2_status_t WSF_CALL
-axis2_http_out_transport_info_set_content_type
- (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
- const axis2_char_t *content_type);
-
+wsf_http_out_transport_info_set_content_type
+ (axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env,
+ const axis2_char_t *content_type);
+
axis2_status_t WSF_CALL
-axis2_http_out_transport_info_set_char_encoding
- (axis2_http_out_transport_info_t *info, const axis2_env_t *env,
+wsf_http_out_transport_info_set_char_encoding
+ (axis2_http_out_transport_info_t *info,
+ const axis2_env_t *env,
const axis2_char_t *encoding);
axis2_status_t WSF_CALL
-axis2_http_out_transport_info_free
- (axis2_http_out_transport_info_t *out_transport_info,
+wsf_http_out_transport_info_free
+ (axis2_http_out_transport_info_t *out_transport_info,
const axis2_env_t *env);
/***************************** End of function headers ************************/
-axis2_http_out_transport_info_t * WSF_CALL
-ws_out_transport_info_create(const axis2_env_t *env,
+axis2_http_out_transport_info_t*
+wsf_out_transport_info_create(const axis2_env_t *env,
php_req_info_t *request)
{
- ws_out_transport_info_impl_t *info_impl = NULL;
+ wsf_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- info_impl = (ws_out_transport_info_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- ws_out_transport_info_impl_t));
+ info_impl = (wsf_out_transport_info_impl_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(wsf_out_transport_info_impl_t));
if(NULL == info_impl){
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -77,32 +77,32 @@
info_impl->out_transport_info.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_out_transport_info_ops_t));
if(NULL == info_impl->out_transport_info.ops){
- axis2_http_out_transport_info_free((axis2_http_out_transport_info_t*)
+ wsf_http_out_transport_info_free((axis2_http_out_transport_info_t*)
info_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
info_impl->out_transport_info.ops->set_content_type =
- axis2_http_out_transport_info_set_content_type;
+ wsf_http_out_transport_info_set_content_type;
info_impl->out_transport_info.ops->set_char_encoding =
- axis2_http_out_transport_info_set_char_encoding;
+ wsf_http_out_transport_info_set_char_encoding;
info_impl->out_transport_info.ops->free =
- axis2_http_out_transport_info_free;
+ wsf_http_out_transport_info_free;
return &(info_impl->out_transport_info);
}
axis2_status_t WSF_CALL
-axis2_http_out_transport_info_free (axis2_http_out_transport_info_t *info,
+wsf_http_out_transport_info_free (axis2_http_out_transport_info_t *info,
const axis2_env_t *env)
{
- ws_out_transport_info_impl_t *info_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ wsf_out_transport_info_impl_t *info_impl = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
info_impl = AXIS2_INTF_TO_IMPL(info);
- info_impl->request = NULL; /* request doesn't belong to info */
+ info_impl->request = NULL; /* request doesn't belong to info */
if(NULL != info_impl->encoding){
AXIS2_FREE(env->allocator, info_impl->encoding);
info_impl->encoding = NULL;
@@ -115,27 +115,27 @@
}
axis2_status_t WSF_CALL
-ws_out_transport_info_free_void_arg (void *transport_info,
+wsf_out_transport_info_free_void_arg (void *transport_info,
const axis2_env_t *env)
{
axis2_http_out_transport_info_t *transport_info_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
transport_info_l = (axis2_http_out_transport_info_t *) transport_info;
- return axis2_http_out_transport_info_free(transport_info_l, env);
+ return wsf_http_out_transport_info_free(transport_info_l, env);
}
axis2_status_t WSF_CALL
-axis2_http_out_transport_info_set_content_type
+wsf_http_out_transport_info_set_content_type
(axis2_http_out_transport_info_t *info, const axis2_env_t *env,
const axis2_char_t *content_type)
{
- axis2_char_t *tmp1 = NULL;
+ axis2_char_t *tmp1 = NULL;
axis2_char_t *tmp2 = NULL;
- ws_out_transport_info_impl_t *info_impl = NULL;
+ wsf_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
info_impl = AXIS2_INTF_TO_IMPL(info);
@@ -155,11 +155,11 @@
axis2_status_t WSF_CALL
-axis2_http_out_transport_info_set_char_encoding
+wsf_http_out_transport_info_set_char_encoding
(axis2_http_out_transport_info_t *info, const axis2_env_t *env,
const axis2_char_t *encoding)
{
- ws_out_transport_info_impl_t *info_impl = NULL;
+ wsf_out_transport_info_impl_t *info_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, encoding, AXIS2_FAILURE);
Modified: wsf/php/src/worker.c
==============================================================================
--- wsf/php/src/worker.c (original)
+++ wsf/php/src/worker.c Mon Jan 8 01:00:24 2007
@@ -222,9 +222,9 @@
/** create transport in description */
{
axis2_property_t *trns_in_desc_prop = NULL;
- php_out_transport_info = ws_out_transport_info_create(env, request);
+ php_out_transport_info = wsf_out_transport_info_create(env, request);
trns_in_desc_prop = axis2_property_create_with_args(env, AXIS2_SCOPE_REQUEST,
- ws_out_transport_info_free_void_arg, php_out_transport_info);
+ wsf_out_transport_info_free_void_arg, php_out_transport_info);
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
trns_in_desc_prop, AXIS2_FALSE);
}
Modified: wsf/php/src/wsf_common.h
==============================================================================
--- wsf/php/src/wsf_common.h (original)
+++ wsf/php/src/wsf_common.h Mon Jan 8 01:00:24 2007
@@ -181,7 +181,7 @@
axis2_svc_t *svc;
axis2_msg_recv_t *msg_recv;
axis2_hash_t *class_info;
- struct wsf_worker *php_worker;
+ struct wsf_worker_t *php_worker;
axis2_hash_t *ops_to_actions;
axis2_hash_t *ops_to_functions;
Modified: wsf/php/src/wsf_out_transport_info.h
==============================================================================
--- wsf/php/src/wsf_out_transport_info.h (original)
+++ wsf/php/src/wsf_out_transport_info.h Mon Jan 8 01:00:24 2007
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef WS_OUT_TRANSPORT_INFO_H
-#define WS_OUT_TRANSPORT_INFO_H
+#ifndef WSF_OUT_TRANSPORT_INFO_H
+#define WSF_OUT_TRANSPORT_INFO_H
#include <axis2_http_out_transport_info.h>
#include "wsf_common.h"
@@ -25,12 +25,12 @@
{
#endif
-WSF_PHP_API axis2_http_out_transport_info_t * WSF_CALL
-ws_out_transport_info_create(const axis2_env_t *env,
- php_req_info_t *r);
+axis2_http_out_transport_info_t*
+wsf_out_transport_info_create(const axis2_env_t *env,
+ php_req_info_t *req);
WSF_PHP_API axis2_status_t WSF_CALL
-ws_out_transport_info_free_void_arg (void *transport_info,
+wsf_out_transport_info_free_void_arg (void *transport_info,
const axis2_env_t *env);
More information about the Wsf-c-dev
mailing list