Author: damitha
Date: Sun Nov  6 19:58:36 2005
New Revision: 331192

URL: http://svn.apache.org/viewcvs?rev=331192&view=rev
Log:
param container free function is modified

Modified:
    webservices/axis2/trunk/c/include/axis2_svc.h
    webservices/axis2/trunk/c/modules/core/description/src/param_container.c
    webservices/axis2/trunk/c/modules/core/description/src/svc.c

Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_svc.h?rev=331192&r1=331191&r2=331192&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Sun Nov  6 19:58:36 2005
@@ -44,54 +44,54 @@
  */    
 struct axis2_svc_ops_s
 {
-       axis2_status_t (AXIS2_CALL *free) (axis2_svc_t *srv_desc, axis2_env_t 
**env);
+       axis2_status_t (AXIS2_CALL *free) (axis2_svc_t *svc, axis2_env_t **env);
 
-       axis2_status_t (AXIS2_CALL *add_operation) (axis2_svc_t *srv_desc, 
+       axis2_status_t (AXIS2_CALL *add_operation) (axis2_svc_t *svc, 
                                                 axis2_env_t **env,
                                                        axis2_operation_t 
*operation);
 
        axis2_operation_t *(AXIS2_CALL *get_operation_with_qname) (
-                                                  axis2_svc_t *srv_desc, 
+                                                  axis2_svc_t *svc, 
                                                   axis2_env_t **env,
                                                          axis2_qname_t 
*operation_name);
 
        axis2_operation_t *(AXIS2_CALL *get_operation_with_name) (
-                                            axis2_svc_t *srv_desc, 
+                                            axis2_svc_t *svc, 
                                             axis2_env_t **env,
                                                    const axis2_char_t * 
operation_name);
 
-       axis2_hash_t *(AXIS2_CALL *get_operations) (axis2_svc_t *srv_desc, 
+       axis2_hash_t *(AXIS2_CALL *get_operations) (axis2_svc_t *svc, 
                                                     axis2_env_t **env);
 
-       axis2_status_t (AXIS2_CALL *set_parent) (axis2_svc_t *srv_desc, 
+       axis2_status_t (AXIS2_CALL *set_parent) (axis2_svc_t *svc, 
                                                 axis2_env_t **env,
                                                        axis2_svc_grp_t 
*svc_grp);
 
-       axis2_svc_grp_t *(AXIS2_CALL *get_parent) (axis2_svc_t *srv_desc, 
+       axis2_svc_grp_t *(AXIS2_CALL *get_parent) (axis2_svc_t *svc, 
                                                 axis2_env_t **env);
        
-       axis2_qname_t *(AXIS2_CALL *get_name) (const axis2_svc_t *srv_desc, 
+       axis2_qname_t *(AXIS2_CALL *get_name) (const axis2_svc_t *svc, 
                                             axis2_env_t **env);
 
-       axis2_status_t (AXIS2_CALL *add_param) (axis2_svc_t *srv_desc, 
+       axis2_status_t (AXIS2_CALL *add_param) (axis2_svc_t *svc, 
                                                 axis2_env_t **env,
                                                        axis2_param_t *param);
 
-       axis2_param_t *(AXIS2_CALL *get_param) (axis2_svc_t *srv_desc, 
+       axis2_param_t *(AXIS2_CALL *get_param) (axis2_svc_t *svc, 
                                                 axis2_env_t **env,
                                                        const axis2_char_t 
*name);
 
-       axis2_hash_t *(AXIS2_CALL *get_params) (axis2_svc_t *srv_desc, 
+       axis2_hash_t *(AXIS2_CALL *get_params) (axis2_svc_t *svc, 
                                                 axis2_env_t **env);
        
-       axis2_bool_t (AXIS2_CALL *is_param_locked) (axis2_svc_t *srv_desc, 
+       axis2_bool_t (AXIS2_CALL *is_param_locked) (axis2_svc_t *svc, 
                                                 axis2_env_t **env,
                                                        const axis2_char_t 
*param_name);
 };
 
 /** 
  * @brief Service struct
- *     Axis2 Service  
+  *    Axis2 Service  
  */
 struct axis2_svc_s
 {
@@ -118,57 +118,34 @@
 
 /**************************** Start of function macros 
************************/
 
-#define axis2_svc_free(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->free \
-               (srv_desc, env));
-
-#define axis2_svc_add_operation(srv_desc, env, operation_desc) \
-               (axis2_svc_get_ops(srv_desc, env)->add_operation \
-               (srv_desc, env, operation_desc));
-
-#define axis2_svc_get_operation_with_qname(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->get_operation_with_qname \
-               (srv_desc, env));
-
-#define axis2_svc_get_operation_with_name(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->get_operation_with_name \
-               (srv_desc, env));
-
-#define axis2_svc_get_operations(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->get_operations \
-               (srv_desc, env));
-
-#define axis2_svc_set_parent(srv_desc, env \
-               , svc_grp) (axis2_svc_get_ops(srv_desc \
-               , env)->set_parent (srv_desc, env, svc_grp));
-
-#define axis2_svc_get_parent(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->get_parent \
-               (srv_desc, env));
-               
-#define axis2_svc_get_name(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->get_name(srv_desc \
-               , env));
+#define AXIS2_SVC_FREE(svc, env) (AXIS2_SVC_get_ops(svc, env)->free (svc, 
env));
+
+#define AXIS2_SVC_ADD_OPERATION(svc, env, operation) \
+               (svc->ops->add_operation (svc, env, operation));
+
+#define AXIS2_SVC_GET_OPERATION_WITH_QNAME(svc, env) \
+               (svc->ops->get_operation_with_qname (svc, env));
+
+#define AXIS2_SVC_GET_OPERATION_WITH_NAME(svc, env) \
+               (svc->ops->get_operation_with_name (svc, env));
+
+#define AXIS2_SVC_GET_OPERATIONS(svc, env) (svc->ops->get_operations (svc, 
env));
+
+#define AXIS2_SVC_SET_PARENT(svc, env , svc_grp) (svc->ops->set_parent \
+        (svc, env, svc_grp));
+
+#define AXIS2_SVC_GET_PARENT(svc, env) (svc->ops->get_parent (svc, env));
                
-#define axis2_svc_add_param(srv_desc, env, param) \
-               (axis2_svc_get_ops(srv_desc, env)->add_param(srv_desc \
-               , env, param));
+#define AXIS2_SVC_GET_NAME(svc, env) (svc->ops->get_name(svc , env));
                
-
-#define axis2_svc_get_param(srv_desc, env, name) \
-               (axis2_svc_get_ops(srv_desc, env)->get_param(srv_desc \
-               , env, name));
+#define AXIS2_SVC_ADD_PARAM(svc, env, param) (svc->ops->add_param(svc , env, 
param));
                
-
-#define axis2_svc_get_params(srv_desc, env) \
-               (axis2_svc_get_ops(srv_desc, env)->get_params(srv_desc \
-               , env));
+#define AXIS2_SVC_GET_PARAM(svc, env, name) (svc->ops->get_param(svc , env, 
name));
                
+#define AXIS2_SVC_GET_PARAMS(svc, env) (svc->ops->get_params(svc , env));
                
-
-#define axis2_svc_is_param_locked(srv_desc, env, \
-               param_name) (axis2_svc_get_ops(env \
-               , srv_desc)->is_parameter_locked(srv_desc, env, param_name));
+#define AXIS2_SVC_IS_PARAM_LOCKED(svc, env, param_name) \
+        (svc->ops->is_parameter_locked(svc, env, param_name));
                                
 
 /**************************** End of function macros 
**************************/

Modified: 
webservices/axis2/trunk/c/modules/core/description/src/param_container.c
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/param_container.c?rev=331192&r1=331191&r2=331192&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/param_container.c 
(original)
+++ webservices/axis2/trunk/c/modules/core/description/src/param_container.c 
Sun Nov  6 19:58:36 2005
@@ -101,7 +101,7 @@
        if(NULL != AXIS2_INTF_TO_IMPL(param_container)->params)
                AXIS2_FREE((*env)->allocator, 
AXIS2_INTF_TO_IMPL(param_container)->params);
        
-    AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(param_container));    
+    axis2_hash_free(AXIS2_INTF_TO_IMPL(param_container), env);    
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/description/src/svc.c
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc.c?rev=331192&r1=331191&r2=331192&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Sun Nov  6 
19:58:36 2005
@@ -1,15 +1,14 @@
 #include <axis2_svc.h>
 
-typedef struct axis2_description_impl_service_s 
axis2_description_impl_service_t;
+typedef struct axis2_svc_impl_s axis2_svc_impl_t;
        
-/**
-  * @struct axis2_description_impl_service
-  * @brief DESCRIPTION service struct impl
-  * This holds the information about service
-  */
-struct axis2_description_impl_service_s
+/** 
+ * @brief Service struct impl
+ *     Axis2 Service impl  
+ */ 
+struct axis2_svc_impl_s
 {
-       axis2_svc_t service;
+       axis2_svc_t svc;
        axis2_param_container_t *param_container;
        axis2_svc_grp_t *parent;
        axis2_hash_t *wasaction_opeartionmap;
@@ -19,59 +18,56 @@
 
 /*************************** Function headers ********************************/
 
-axis2_status_t axis2_svc_ops_free
-               (axis2_svc_t *srv_desc, axis2_env_t *env);
+axis2_status_t AXIS2_CALL 
+axis2_svc_free (axis2_svc_t *svc, axis2_env_t **env);
 
-axis2_status_t axis2_svc_ops_add_operation
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , axis2_operation_t *operation_desc);
-
-axis2_operation_t *
-               axis2_svc_ops_get_operation_with_qname(
-               axis2_svc_t *srv_desc, axis2_env_t *env
-               , axis2_qname_t *operation_name);
+axis2_status_t AXIS2_CALL
+axis2_svc_add_operation (axis2_svc_t *svc, axis2_env_t **env
+               ,                   axis2_operation_t *operation_desc);
+
+axis2_operation_t * AXIS2_CALL
+axis2_svc_get_operation_with_qname (axis2_svc_t *svc, axis2_env_t **env,
+                                           axis2_qname_t *operation_name);
                
-axis2_operation_t *
-               axis2_svc_ops_get_operation_with_name
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , const axis2_char_t* operation_name);
+axis2_operation_t * AXIS2_CALL
+axis2_svc_get_operation_with_name (axis2_svc_t *svc, axis2_env_t **env,
+                                           const axis2_char_t* operation_name);
 
-axis2_hash_t *axis2_svc_ops_get_operations(
-               axis2_svc_t *srv_desc, axis2_env_t *env);
+axis2_hash_t * AXIS2_CALL
+axis2_svc_get_operations (axis2_svc_t *svc, axis2_env_t **env);
                
-axis2_status_t axis2_svc_ops_set_parent
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               ,axis2_svc_grp_t *servicegroup_desc);
+axis2_status_t AXIS2_CALL
+axis2_svc_set_parent (axis2_svc_t *svc, axis2_env_t **env, 
+                        axis2_svc_grp_t *svc_grp);
 
-axis2_svc_grp_t *axis2_svc_ops_get_parent
-               (axis2_svc_t *srv_desc, axis2_env_t *env);
+axis2_svc_grp_t * AXIS2_CALL
+axis2_svc_get_parent (axis2_svc_t *svc, axis2_env_t **env);
                
-axis2_qname_t *axis2_svc_ops_get_name
-               (const axis2_svc_t *srv_desc, axis2_env_t *env);        
+axis2_qname_t * AXIS2_CALL
+axis2_svc_get_name (const axis2_svc_t *svc, axis2_env_t **env);        
 
-axis2_status_t axis2_svc_ops_add_param
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , axis2_param_t *param);
-
-axis2_param_t *axis2_svc_ops_get_param
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , const axis2_char_t *name);
-
-axis2_hash_t *axis2_svc_ops_get_params
-               (axis2_svc_t *srv_desc, axis2_env_t *env);
-
-axis2_bool_t axis2_svc_ops_is_param_locked(
-               axis2_svc_t *srv_desc, axis2_env_t *env
-               , const axis2_char_t *param_name);
+axis2_status_t AXIS2_CALL
+axis2_svc_add_param (axis2_svc_t *svc, axis2_env_t **env, axis2_param_t 
*param);
+
+axis2_param_t * AXIS2_CALL
+axis2_svc_get_param (axis2_svc_t *svc, axis2_env_t **env,
+                               const axis2_char_t *name);
+
+axis2_hash_t * AXIS2_CALL
+axis2_svc_get_params (axis2_svc_t *svc, axis2_env_t **env);
+
+axis2_bool_t AXIS2_CALL
+axis2_svc_is_param_locked (axis2_svc_t *svc, axis2_env_t **env,
+                                   const axis2_char_t *param_name);
                
 /************************* End of function headers ***************************/
 
-axis2_svc_t *axis2_svc_create
-               (axis2_env_t *env)
+axis2_svc_t * AXIS2_CALL
+axis2_svc_create (axis2_env_t **env)
 {
-       axis2_svc_t *srv_desc = (axis2_svc_t *)
+       axis2_svc_t *svc = (axis2_svc_t *)
                AXIS2_MALLOC (env->allocator, sizeof(axis2_svc_t));
-       if(!srv_desc)
+       if(!svc)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
@@ -83,21 +79,21 @@
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;    
        }
-       ops->free = axis2_svc_ops_free;
-       ops->add_operation = axis2_svc_ops_add_operation;
+       ops->free = axis2_svc_free;
+       ops->add_operation = axis2_svc_add_operation;
        ops->get_operation_with_qname = 
-               axis2_svc_ops_get_operation_with_qname;
+               axis2_svc_get_operation_with_qname;
        ops->get_operation_with_name = 
-               axis2_svc_ops_get_operation_with_name;
-       ops->get_operations = axis2_svc_ops_get_operations;
-       ops->set_parent = axis2_svc_ops_set_parent;
-       ops->get_parent = axis2_svc_ops_get_parent;
-       ops->get_name = axis2_svc_ops_get_name;
-       ops->add_param = axis2_svc_ops_add_param;
-       ops->get_param = axis2_svc_ops_get_param;
-       ops->get_params = axis2_svc_ops_get_params;
+               axis2_svc_get_operation_with_name;
+       ops->get_operations = axis2_svc_get_operations;
+       ops->set_parent = axis2_svc_set_parent;
+       ops->get_parent = axis2_svc_get_parent;
+       ops->get_name = axis2_svc_get_name;
+       ops->add_param = axis2_svc_add_param;
+       ops->get_param = axis2_svc_get_param;
+       ops->get_params = axis2_svc_get_params;
        
-       srv_desc->ops = ops;
+       svc->ops = ops;
        
        axis2_param_container_t *param_container 
                = (axis2_param_container_t *)
@@ -108,63 +104,66 @@
                return NULL;
        }
 
-       srv_desc->param_container = param_container;
+       svc->param_container = param_container;
        
-       srv_desc->parent = NULL;
+       svc->parent = NULL;
        
-       srv_desc->wasaction_opeartionmap = axis2_hash_make (env);               
                
-       if(!srv_desc->wasaction_opeartionmap)
+       svc->wasaction_opeartionmap = axis2_hash_make (env);                    
        
+       if(!svc->wasaction_opeartionmap)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;                    
        }
-       srv_desc->name = NULL;
+       svc->name = NULL;
 
-       return srv_desc;        
+       return svc;     
 }
 
-axis2_svc_t *axis2_svc_create_with_qname
-               (axis2_env_t *env, axis2_qname_t *qname)
+axis2_svc_t * AXIS2_CALL
+axis2_svc_create_with_qname (axis2_env_t **env, 
+                                axis2_qname_t *qname)
 {
-       axis2_svc_t *srv_desc = 
+       axis2_svc_t *svc = 
                axis2_svc_create(env);
-       if(!srv_desc)
+       if(!svc)
        {
                env->error->error_number = AXIS2_ERROR_NO_MEMORY;
                return NULL;
        }
-       srv_desc->name = axis2_strdup(qname);
+       svc->name = axis2_strdup(qname);
        
-       return srv_desc;
+       return svc;
 }
 
 /********************** Start of function implementations ********************/
 
-axis2_status_t axis2_svc_ops_free
-               (axis2_svc_t *srv_desc, axis2_env_t *env)
+axis2_status_t AXIS2_CALL
+axis2_svc_free (axis2_svc_t *svc, 
+                axis2_env_t **env)
 {
        if(!env)
                return AXIS2_ERROR_INVALID_NULL_PARAM;
-       if(srv_desc)
+       if(svc)
        {
-               AXIS2_FREE(env->allocator, srv_desc);
+               AXIS2_FREE(env->allocator, svc);
                return AXIS2_SUCCESS;
        }
        return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED;
 }
 
 
-axis2_status_t axis2_svc_ops_add_operation
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , axis2_operation_t *operation_desc)
+axis2_status_t AXIS2_CALL
+axis2_svc_add_operation (axis2_svc_t *svc,
+                            axis2_env_t **env,
+                                   axis2_operation_t *operation_desc)
 {
-       if(!srv_desc || !operation_desc)
+       if(!svc || !operation_desc)
        {
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        }
-       if (!(srv_desc->wasaction_opeartionmap))
+       if (!(svc->wasaction_opeartionmap))
        {                    
-               srv_desc->wasaction_opeartionmap = axis2_hash_make (env);
+               svc->wasaction_opeartionmap = axis2_hash_make (env);
        }
        axis2_operation_ops_t *tempopt = 
                (axis2_operation_get_ops(operation_desc, env));
@@ -179,109 +178,115 @@
        
        if(!tempname) return AXIS2_ERROR_INVALID_NULL_PARAM;
        
-       axis2_hash_set (srv_desc->wasaction_opeartionmap                
+       axis2_hash_set (svc->wasaction_opeartionmap             
                , tempname
                , AXIS2_HASH_KEY_STRING, operation_desc);
        
        return AXIS2_SUCCESS;
 }
 
-axis2_operation_t 
-               *axis2_svc_ops_get_operation_with_qname
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , axis2_qname_t *operation_name)
+axis2_operation_t * AXIS2_CALL
+axis2_svc_get_operation_with_qname (axis2_svc_t *svc,
+                                        axis2_env_t **env,
+                                               axis2_qname_t *operation_name)
 {
-       if(!srv_desc || !srv_desc->wasaction_opeartionmap)
+       if(!svc || !svc->wasaction_opeartionmap)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;            
        }
        return (axis2_operation_t *) (axis2_hash_get 
-               (srv_desc->wasaction_opeartionmap, operation_name->localpart
+               (svc->wasaction_opeartionmap, operation_name->localpart
                , AXIS2_HASH_KEY_STRING));
        
 }      
 
-axis2_operation_t 
-               *axis2_svc_ops_get_operation_with_name
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , const axis2_char_t* name)
+axis2_operation_t * AXIS2_CALL
+axis2_svc_get_operation_with_name (axis2_svc_t *svc, 
+                                    axis2_env_t **env,
+                                           const axis2_char_t* name)
 {
-       if(!srv_desc || !srv_desc->wasaction_opeartionmap)
+       if(!svc || !svc->wasaction_opeartionmap)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;            
        }
        return (axis2_operation_t *) (axis2_hash_get 
-               (srv_desc->wasaction_opeartionmap
+               (svc->wasaction_opeartionmap
                , axis2_strdup(name), AXIS2_HASH_KEY_STRING));
 }
 
-axis2_hash_t *axis2_svc_ops_get_operations
-               (axis2_svc_t *srv_desc, axis2_env_t *env)
+axis2_hash_t * AXIS2_CALL
+axis2_svc_get_operations (axis2_svc_t *svc, 
+                            axis2_env_t **env)
 {
-       if(!srv_desc)
+       if(!svc)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;            
        }
-       return srv_desc->wasaction_opeartionmap;
+       return svc->wasaction_opeartionmap;
 }
        
-axis2_status_t axis2_svc_ops_set_parent
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               ,axis2_svc_grp_t *servicegroup_desc)
+axis2_status_t AXIS2_CALL
+axis2_svc_set_parent (axis2_svc_t *svc, 
+                        axis2_env_t **env,
+                               axis2_svc_grp_t *svc_grp)
 {
-       if(!srv_desc || !servicegroup_desc)
+       if(!svc || !svc_grp)
        {
                return AXIS2_ERROR_INVALID_NULL_PARAM;  
        }
-       srv_desc->parent = servicegroup_desc;
+       svc->parent = svc_grp;
        return AXIS2_SUCCESS;
 }
 
-axis2_svc_grp_t *axis2_svc_ops_get_parent
-               (axis2_svc_t *srv_desc, axis2_env_t *env)
+axis2_svc_grp_t * AXIS2_CALL
+axis2_svc_get_parent (axis2_svc_t *svc, 
+                        axis2_env_t **env)
 {
-       if(!srv_desc || !srv_desc->parent)
+       if(!svc || !svc->parent)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;    
        }
-       return srv_desc->parent;
+       return svc->parent;
 }
 
-axis2_qname_t *axis2_svc_ops_get_name
-               (const axis2_svc_t *srv_desc, axis2_env_t *env)
+axis2_qname_t * AXIS2_CALL
+axis2_svc_get_name (const axis2_svc_t *svc, 
+                    axis2_env_t **env)
 {
-       if(!env || !srv_desc)
+       if(!env || !svc)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;    
        }
-       return srv_desc->name;
+       return svc->name;
 }
 
-axis2_status_t axis2_svc_ops_add_param
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , axis2_param_t *param)
+axis2_status_t AXIS2_CALL
+axis2_svc_add_param (axis2_svc_t *svc, 
+                        axis2_env_t **env,
+                               axis2_param_t *param)
 {
-       if(!env || !srv_desc || !srv_desc->param_container || !param)
+       if(!env || !svc || !svc->param_container || !param)
        {
                return AXIS2_ERROR_INVALID_NULL_PARAM;
        }
        axis2_hash_set (axis2_param_container_get_params
-               (srv_desc->param_container, env), axis2_param_get_name(param
+               (svc->param_container, env), axis2_param_get_name(param
                , env)
                , AXIS2_HASH_KEY_STRING, param);        
        return AXIS2_SUCCESS;
 }
 
-axis2_param_t *axis2_svc_ops_get_param(
-               axis2_svc_t *srv_desc, axis2_env_t *env
-               , const axis2_char_t *name)
+axis2_param_t * AXIS2_CALL
+axis2_svc_get_param (axis2_svc_t *svc, 
+                        axis2_env_t **env,
+                               const axis2_char_t *name)
 {
-       if(!env || !srv_desc || !srv_desc->param_container)
+       if(!env || !svc || !svc->param_container)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;
@@ -294,28 +299,30 @@
        }
                
        return (axis2_param_t *)(axis2_hash_get 
-               (axis2_param_container_get_params(srv_desc->param_container, 
env)
+               (axis2_param_container_get_params(svc->param_container, env)
                , tempname, AXIS2_HASH_KEY_STRING));
        
 }
 
-axis2_hash_t *axis2_svc_ops_get_params
-               (axis2_svc_t *srv_desc, axis2_env_t *env)
+axis2_hash_t * AXIS2_CALL
+axis2_svc_get_params (axis2_svc_t *svc, 
+                        axis2_env_t **env)
 {
-       if(!env || !srv_desc)
+       if(!env || !svc)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return NULL;            
        }
-       return axis2_param_container_get_params(srv_desc->param_container, env);
+       return axis2_param_container_get_params(svc->param_container, env);
        
 }
 
-axis2_bool_t axis2_svc_ops_is_param_locked
-               (axis2_svc_t *srv_desc, axis2_env_t *env
-               , const axis2_char_t *param_name)
+axis2_bool_t AXIS2_CALL
+axis2_svc_is_param_locked (axis2_svc_t *svc, 
+                            axis2_env_t **env,
+                                   const axis2_char_t *param_name)
 {
-       if(!env || !srv_desc || !srv_desc->param_container)
+       if(!env || !svc || !svc->param_container)
        {
                env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAM;
                return AXIS2_FALSE;
@@ -328,6 +335,6 @@
        }
                
        return axis2_param_container_is_param_locked
-               (srv_desc->param_container, env, param_name); 
+               (svc->param_container, env, param_name); 
        
 }


Reply via email to