Modified: webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c?rev=331178&r1=331177&r2=331178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc_grp.c Sun Nov  6 
18:23:20 2005
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
  
-#include <axis2_description_service_group.h>
+#include <axis2_svc_grp.h>
 
-/** @struct axis2_description_servicegroup_s
+/** @struct axis2_svc_grp_s
   * @brief DESCRIPTION servicegroup
   * This holds the information about the servicegroup_name
   */
-struct axis2_description_servicegroup_s
+struct axis2_svc_grp_s
 {
-       axis2_description_servicegroup_ops_t *ops;
-       axis2_description_param_include_t *param_include;
+       axis2_svc_grp_ops_t *ops;
+       axis2_param_container_t *param_container;
        axis2_char_t *servicegroup_name;
        axis2_hash_t *services;
        
@@ -31,48 +31,48 @@
 
 /***************************** Function headers 
*******************************/
 
-axis2_status_t axis2_description_servicegroup_ops_free
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env);
+axis2_status_t axis2_svc_grp_ops_free
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env);
 
-axis2_status_t axis2_description_servicegroup_ops_set_name
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_status_t axis2_svc_grp_ops_set_name
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , axis2_char_t *name);
 
-axis2_char_t *axis2_description_servicegroup_ops_get_name
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env);
+axis2_char_t *axis2_svc_grp_ops_get_name
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env);
 
-axis2_status_t axis2_description_servicegroup_ops_add_service
-               (axis2_description_servicegroup_t* srvgrp_desc, axis2_env_t *env
-               , axis2_description_service_t *service_desc);
+axis2_status_t axis2_svc_grp_ops_add_service
+               (axis2_svc_grp_t* srvgrp_desc, axis2_env_t *env
+               , axis2_svc_t *service_desc);
 
-axis2_description_service_t *axis2_description_servicegroup_ops_get_service
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_svc_t *axis2_svc_grp_ops_get_service
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_qname_t* service_name);
                
-axis2_status_t axis2_description_servicegroup_ops_remove_service
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_status_t axis2_svc_grp_ops_remove_service
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_qname_t* service_name);
                
-axis2_status_t axis2_description_servicegroup_ops_add_param
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
-               , axis2_description_param_t *param);
+axis2_status_t axis2_svc_grp_ops_add_param
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
+               , axis2_param_t *param);
                
 
-axis2_description_param_t *axis2_description_servicegroup_ops_get_param(
-               axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_param_t *axis2_svc_grp_ops_get_param(
+               axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_char_t *name);
                
-axis2_hash_t *axis2_description_servicegroup_ops_get_params
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env);
+axis2_hash_t *axis2_svc_grp_ops_get_params
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env);
                
-axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
-               axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_bool_t axis2_svc_grp_ops_is_param_locked(
+               axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_char_t *param_name);
 
 /***************************** End of function headers 
************************/
 
-axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env)
+axis2_svc_grp_ops_t *axis2_svc_grp_get_ops
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env)
 {
        if(!env || !srvgrp_desc)
        {
@@ -82,48 +82,48 @@
        return srvgrp_desc->ops;
 }
 
-axis2_description_servicegroup_t *axis2_description_servicegroup_create
+axis2_svc_grp_t *axis2_svc_grp_create
                (axis2_env_t *env)
 {
-       axis2_description_servicegroup_t *srvgrp_desc 
-               = (axis2_description_servicegroup_t *)
-               AXIS2_MALLOC (env->allocator, 
sizeof(axis2_description_servicegroup_t));
+       axis2_svc_grp_t *srvgrp_desc 
+               = (axis2_svc_grp_t *)
+               AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_grp_t));
        if(!srvgrp_desc)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
        }
-       axis2_description_servicegroup_ops_t *ops 
-               = (axis2_description_servicegroup_ops_t *)
-               AXIS2_MALLOC (env->allocator, 
sizeof(axis2_description_servicegroup_ops_t));
+       axis2_svc_grp_ops_t *ops 
+               = (axis2_svc_grp_ops_t *)
+               AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_grp_ops_t));
        if(!ops)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;    
        }
-       ops->free = axis2_description_servicegroup_ops_free;
-       ops->set_name = axis2_description_servicegroup_ops_set_name;
-       ops->get_name = axis2_description_servicegroup_ops_get_name;
-       ops->add_service = axis2_description_servicegroup_ops_add_service;
-       ops->get_service = axis2_description_servicegroup_ops_get_service;
-       ops->remove_service = axis2_description_servicegroup_ops_remove_service;
-       ops->add_param = axis2_description_servicegroup_ops_add_param;
-       ops->get_param = axis2_description_servicegroup_ops_get_param;
-       ops->get_params = axis2_description_servicegroup_ops_get_params;
-       ops->is_param_locked = 
axis2_description_servicegroup_ops_is_param_locked;
+       ops->free = axis2_svc_grp_ops_free;
+       ops->set_name = axis2_svc_grp_ops_set_name;
+       ops->get_name = axis2_svc_grp_ops_get_name;
+       ops->add_service = axis2_svc_grp_ops_add_service;
+       ops->get_service = axis2_svc_grp_ops_get_service;
+       ops->remove_service = axis2_svc_grp_ops_remove_service;
+       ops->add_param = axis2_svc_grp_ops_add_param;
+       ops->get_param = axis2_svc_grp_ops_get_param;
+       ops->get_params = axis2_svc_grp_ops_get_params;
+       ops->is_param_locked = axis2_svc_grp_ops_is_param_locked;
        
        srvgrp_desc->ops = ops;
        
-       axis2_description_param_include_t *param_include 
-               = (axis2_description_param_include_t *)
-               axis2_description_param_include_create(env);            
-       if(!param_include)
+       axis2_param_container_t *param_container 
+               = (axis2_param_container_t *)
+               axis2_param_container_create(env);              
+       if(!param_container)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
        }
 
-       srvgrp_desc->param_include = param_include;
+       srvgrp_desc->param_container = param_container;
        
        /*srvgrp_desc->parent = NULL;*/
        
@@ -140,8 +140,8 @@
 
 
/******************************************************************************/
 
-axis2_status_t axis2_description_servicegroup_ops_free
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env)
+axis2_status_t axis2_svc_grp_ops_free
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env)
 {
        if(!env || !srvgrp_desc)
                return AXIS2_ERROR_INVALID_NULL_PARAM;
@@ -149,8 +149,8 @@
        return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_description_servicegroup_ops_set_name
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_status_t axis2_svc_grp_ops_set_name
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , axis2_char_t *name)
 {
        if(!env || !srvgrp_desc)
@@ -161,8 +161,8 @@
        return AXIS2_SUCCESS;
 }
 
-axis2_char_t *axis2_description_servicegroup_ops_get_name
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env)
+axis2_char_t *axis2_svc_grp_ops_get_name
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env)
 {
        if(!env || !srvgrp_desc)
        {
@@ -172,21 +172,21 @@
        return srvgrp_desc->servicegroup_name;
 }
 
-axis2_status_t axis2_description_servicegroup_ops_add_service
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
-               , axis2_description_service_t *service_desc)
+axis2_status_t axis2_svc_grp_ops_add_service
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
+               , axis2_svc_t *service_desc)
 {
        if(!env || srvgrp_desc || service_desc)
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        
-       axis2_qname_t *tempname = 
axis2_description_service_get_name(service_desc, env);
+       axis2_qname_t *tempname = axis2_svc_get_name(service_desc, env);
        axis2_hash_set (srvgrp_desc->services, tempname->localpart
                , AXIS2_HASH_KEY_STRING, service_desc);
        return AXIS2_SUCCESS;
 }
 
-axis2_description_service_t *axis2_description_servicegroup_ops_get_service
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env 
+axis2_svc_t *axis2_svc_grp_ops_get_service
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env 
                , const axis2_qname_t* service_name)
 {
        if(!env || !srvgrp_desc || ! service_name)
@@ -194,13 +194,13 @@
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;
        }
-       return (axis2_description_service_t *) (axis2_hash_get 
+       return (axis2_svc_t *) (axis2_hash_get 
                (srvgrp_desc->services, service_name->localpart
                , AXIS2_HASH_KEY_STRING));
 }
 
-axis2_status_t axis2_description_servicegroup_ops_remove_service
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_status_t axis2_svc_grp_ops_remove_service
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_qname_t* service_name)
 {
        if(!env || !srvgrp_desc || ! service_name)
@@ -213,26 +213,26 @@
        return AXIS2_SUCCESS;
 }
 
-axis2_status_t axis2_description_servicegroup_ops_add_param
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
-               , axis2_description_param_t *param)
+axis2_status_t axis2_svc_grp_ops_add_param
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
+               , axis2_param_t *param)
 {
-       if(!env || !srvgrp_desc || !srvgrp_desc->param_include || !param)
+       if(!env || !srvgrp_desc || !srvgrp_desc->param_container || !param)
        {
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        }
-       axis2_hash_set (axis2_description_param_include_get_params
-               (srvgrp_desc->param_include, env), 
axis2_description_param_get_name
+       axis2_hash_set (axis2_param_container_get_params
+               (srvgrp_desc->param_container, env), axis2_param_get_name
                (param, env)
                , AXIS2_HASH_KEY_STRING, param);        
        return AXIS2_SUCCESS;
 }
 
-axis2_description_param_t *axis2_description_servicegroup_ops_get_param(
-               axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_param_t *axis2_svc_grp_ops_get_param(
+               axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_char_t *name)
 {
-       if(!env || !srvgrp_desc || !srvgrp_desc->param_include)
+       if(!env || !srvgrp_desc || !srvgrp_desc->param_container)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;
@@ -244,30 +244,30 @@
                return NULL;
        }
                
-       return (axis2_description_param_t *)(axis2_hash_get 
-               (axis2_description_param_include_get_params
-               (srvgrp_desc->param_include, env), tempname, 
AXIS2_HASH_KEY_STRING));
+       return (axis2_param_t *)(axis2_hash_get 
+               (axis2_param_container_get_params
+               (srvgrp_desc->param_container, env), tempname, 
AXIS2_HASH_KEY_STRING));
        
 }
 
-axis2_hash_t *axis2_description_servicegroup_ops_get_params
-               (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t 
*env)
+axis2_hash_t *axis2_svc_grp_ops_get_params
+               (axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env)
 {
        if(!env || !srvgrp_desc)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;            
        }
-       return 
axis2_description_param_include_get_params(srvgrp_desc->param_include
+       return axis2_param_container_get_params(srvgrp_desc->param_container
                , env);
        
 }
 
-axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
-               axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+axis2_bool_t axis2_svc_grp_ops_is_param_locked(
+               axis2_svc_grp_t *srvgrp_desc, axis2_env_t *env
                , const axis2_char_t *param_name)
 {
-       if(!env || !srvgrp_desc || !srvgrp_desc->param_include)
+       if(!env || !srvgrp_desc || !srvgrp_desc->param_container)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return AXIS2_FALSE;
@@ -279,7 +279,7 @@
                return AXIS2_FALSE;
        }
                
-       return axis2_description_param_include_is_param_locked
-               (srvgrp_desc->param_include, env, param_name); 
+       return axis2_param_container_is_param_locked
+               (srvgrp_desc->param_container, env, param_name); 
        
 }

Modified: webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c?rev=331178&r1=331177&r2=331178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/engine_config.c Sun Nov  
6 18:23:20 2005
@@ -28,7 +28,7 @@
 struct axis2_engine_impl_config_s
 {
        axis2_engine_config_t engine;
-    axis2_description_param_include_t * param_include;
+    axis2_param_container_t * param_container;
     axis2_hash_t *service_groups;
 };
        
@@ -39,17 +39,17 @@
 
 axis2_status_t axis2_engine_config_ops_add_service_group
                (axis2_engine_config_t *engine_config, axis2_env_t *env
-       , axis2_description_servicegroup_t *service_group_desc);
+       , axis2_svc_grp_t *service_group_desc);
 
-axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup
+axis2_svc_grp_t *axis2_engine_config_ops_get_servicegroup
                (axis2_engine_config_t *engine_config, axis2_env_t *env
                , const axis2_char_t *servicegroup_name);
 
 axis2_status_t axis2_engine_config_ops_add_service
                (axis2_engine_config_t *engine_config, axis2_env_t *env
-               , axis2_description_service_t* service_desc);
+               , axis2_svc_t* service_desc);
 
-axis2_description_service_t *axis2_engine_config_ops_get_service
+axis2_svc_t *axis2_engine_config_ops_get_service
                (axis2_engine_config_t *engine_config, axis2_env_t *env
                , const axis2_char_t* service_name);
 
@@ -95,16 +95,16 @@
        
        (engine_impl_config->engine_config).ops = ops;
 
-       axis2_description_param_include_t *param_include 
-               = (axis2_description_param_include_t *)
-               axis2_description_param_include_create(env);            
-       if(NULL == param_include)
+       axis2_param_container_t *param_container 
+               = (axis2_param_container_t *)
+               axis2_param_container_create(env);              
+       if(NULL == param_container)
        {
                (*env)->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
        }
 
-       (engine_impl_config->engine_config).param_include = param_include;
+       (engine_impl_config->engine_config).param_container = param_container;
        
        (engine_impl_config->engine_config).service_groups = NULL;
        
@@ -125,14 +125,14 @@
 
 axis2_status_t axis2_engine_config_ops_add_service_group
                (axis2_engine_config_t *engine_config, axis2_env_t *env
-       , axis2_description_servicegroup_t *servicegroup_desc)
+       , axis2_svc_grp_t *servicegroup_desc)
 {
        if(!engine_config || !servicegroup_desc)
        {
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        }
        
-       axis2_char_t *tempname = axis2_description_servicegroup_get_name
+       axis2_char_t *tempname = axis2_svc_grp_get_name
                        (servicegroup_desc, env);
        axis2_hash_set (engine_config->service_groups
                , tempname
@@ -140,7 +140,7 @@
        return AXIS2_SUCCESS;
 }
 
-axis2_description_servicegroup_t *axis2_engine_config_ops_get_servicegroup
+axis2_svc_grp_t *axis2_engine_config_ops_get_servicegroup
                (axis2_engine_config_t *engine_config, axis2_env_t *env
                , const axis2_char_t *servicegroup_name)
 {
@@ -155,38 +155,38 @@
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;
        }
-       return (axis2_description_servicegroup_t *) (axis2_hash_get 
+       return (axis2_svc_grp_t *) (axis2_hash_get 
                (engine_config->service_groups, tempname
                , AXIS2_HASH_KEY_STRING));
 }
 
 axis2_status_t axis2_engine_config_ops_add_service
                (axis2_engine_config_t *engine_config, axis2_env_t *env
-               , axis2_description_service_t *srv_desc)
+               , axis2_svc_t *srv_desc)
 {
        if(NULL == engine_config || NULL == srv_desc) 
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        
-       axis2_description_servicegroup_t *servicegroup_desc 
-               = axis2_description_servicegroup_create(env);
+       axis2_svc_grp_t *servicegroup_desc 
+               = axis2_svc_grp_create(env);
        
        if(!servicegroup_desc)
                return AXIS2_ERROR_NO_MEMORY;
        
-       axis2_qname_t *servicegroup_qname = 
axis2_description_service_get_name(srv_desc, env);
+       axis2_qname_t *servicegroup_qname = axis2_svc_get_name(srv_desc, env);
        
        axis2_char_t *servicegroup_name = servicegroup_qname->localpart;
        
-       axis2_description_servicegroup_set_name(servicegroup_desc, env
+       axis2_svc_grp_set_name(servicegroup_desc, env
                , servicegroup_name);
        
-       axis2_description_servicegroup_add_service(servicegroup_desc, env
+       axis2_svc_grp_add_service(servicegroup_desc, env
                , srv_desc);
        
        return AXIS2_SUCCESS;
 }
 
-axis2_description_service_t *axis2_engine_config_ops_get_service
+axis2_svc_t *axis2_engine_config_ops_get_service
                (axis2_engine_config_t *engine_config, axis2_env_t *env
                , const axis2_char_t* service_name)
 {
@@ -202,7 +202,7 @@
                return NULL;
        }
        
-       axis2_description_servicegroup_t *sg = NULL;
+       axis2_svc_grp_t *sg = NULL;
        int len = strlen(service_name);
        axis2_char_t *service_st[2];
        service_st[1] = (axis2_char_t*) AXIS2_MALLOC
@@ -220,7 +220,7 @@
        axis2_char_t *srv_name = *(service_st + 1);
        axis2_qname_t *qname = (axis2_qname_t*) axis2_qname_create(env, 
srv_name, NULL, NULL); 
        
-       return axis2_description_servicegroup_get_service(sg, env, qname);
+       return axis2_svc_grp_get_service(sg, env, qname);
        return NULL;
                        
 }
@@ -235,7 +235,7 @@
        if(!tempname)
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        
-       axis2_description_servicegroup_t *sg = NULL;
+       axis2_svc_grp_t *sg = NULL;
        int len = strlen(service_name);
        axis2_char_t *service_st[2];
        service_st[1] = (axis2_char_t*) AXIS2_MALLOC
@@ -255,7 +255,7 @@
        axis2_qname_t *qname = (axis2_qname_t*) axis2_qname_create(srv_name, env
                , NULL, NULL);
        
-       axis2_description_servicegroup_remove_service(sg, env, qname);
+       axis2_svc_grp_remove_service(sg, env, qname);
        
        return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c?rev=331178&r1=331177&r2=331178&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/msg_recv.c Sun Nov  6 
18:23:20 2005
@@ -14,80 +14,80 @@
  * limitations under the License.
  */
  
-#include <axis2_engine_msg_receiver.h>
+#include <axis2_engine_msg_recv.h>
 
 /**
-  * @struct axis2_engine_msg_receiver_s
-  * @brief ENGINE msg_receiver
-  * This holds the information about msg_receiver.
+  * @struct axis2_engine_msg_recv_s
+  * @brief ENGINE msg_recv
+  * This holds the information about msg_recv.
   */
-struct axis2_engine_msg_receiver_s
+struct axis2_engine_msg_recv_s
 {
-       axis2_engine_msg_receiver_ops_t *ops;
+       axis2_engine_msg_recv_ops_t *ops;
 };
        
 /*************************** Function headers 
*********************************/
 
-axis2_status_t axis2_engine_msg_receiver_ops_free (axis2_env_t *env
-               , axis2_engine_msg_receiver_t *msg_receiver);   
+axis2_status_t axis2_engine_msg_recv_ops_free (axis2_env_t *env
+               , axis2_engine_msg_recv_t *msg_recv);   
 
-axis2_status_t axis2_engine_msg_receiver_ops_receive (axis2_env_t *env
-               , axis2_engine_msg_receiver_t *msg_receiver
+axis2_status_t axis2_engine_msg_recv_ops_receive (axis2_env_t *env
+               , axis2_engine_msg_recv_t *msg_recv
                , axis2_context_msg_ctx_t *msg_ctx);
                
 /************************* End of function headers 
****************************/       
 
-axis2_engine_msg_receiver_t *axis2_engine_msg_receiver_get_ops
-               (axis2_env_t *env, axis2_engine_msg_receiver_t *msg_receiver)
+axis2_engine_msg_recv_t *axis2_engine_msg_recv_get_ops
+               (axis2_env_t *env, axis2_engine_msg_recv_t *msg_recv)
 {
-       if(!msg_receiver)
+       if(!msg_recv)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;    
        }
-       return (axis2_engine_msg_receiver_t *) msg_receiver->ops;
+       return (axis2_engine_msg_recv_t *) msg_recv->ops;
 }
 
-axis2_engine_msg_receiver_t *axis2_engine_msg_receiver_create 
+axis2_engine_msg_recv_t *axis2_engine_msg_recv_create 
                (axis2_env_t *env)
 {
-       axis2_engine_msg_receiver_ops_t *ops = NULL;
-       axis2_engine_msg_receiver_t *msg_receiver = 
-               (axis2_engine_msg_receiver_t *) AXIS2_MALLOC (env->allocator
-               , sizeof (axis2_engine_msg_receiver_t));
-       if(!msg_receiver)
+       axis2_engine_msg_recv_ops_t *ops = NULL;
+       axis2_engine_msg_recv_t *msg_recv = 
+               (axis2_engine_msg_recv_t *) AXIS2_MALLOC (env->allocator
+               , sizeof (axis2_engine_msg_recv_t));
+       if(!msg_recv)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
        }
-       ops = (axis2_engine_msg_receiver_ops_t *) AXIS2_MALLOC(env->allocator,
-               sizeof(axis2_engine_msg_receiver_ops_t));
+       ops = (axis2_engine_msg_recv_ops_t *) AXIS2_MALLOC(env->allocator,
+               sizeof(axis2_engine_msg_recv_ops_t));
        if(!ops)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
        }       
-       ops->free = axis2_engine_msg_receiver_ops_free;
+       ops->free = axis2_engine_msg_recv_ops_free;
        
-       msg_receiver->ops = ops;
+       msg_recv->ops = ops;
                                                
-       return msg_receiver;
+       return msg_recv;
 }
 
 
/******************************************************************************/
 
-axis2_status_t axis2_engine_msg_receiver_ops_free (axis2_env_t *env
-               , axis2_engine_msg_receiver_t *msg_receiver)
+axis2_status_t axis2_engine_msg_recv_ops_free (axis2_env_t *env
+               , axis2_engine_msg_recv_t *msg_recv)
 {
-       if(msg_receiver){
-               free(msg_receiver);
+       if(msg_recv){
+               free(msg_recv);
                return AXIS2_SUCCESS;
        }
        return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED;
 }
 
 axis2_status_t axis2_engine_msg_receive(axis2_env_t *env
-               , axis2_engine_msg_receiver_t *msg_receiver
+               , axis2_engine_msg_recv_t *msg_recv
                , axis2_context_msg_ctx_t *msg_ctx)
 {
        return AXIS2_SUCCESS;


Reply via email to