You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/11/01 12:09:17 UTC
svn commit: r330024 - in /webservices/axis2/trunk/c: ides/anjuta/ include/
modules/core/description/src/
Author: damitha
Date: Tue Nov 1 03:08:52 2005
New Revision: 330024
URL: http://svn.apache.org/viewcvs?rev=330024&view=rev
Log:
More changes on core and project updated
Modified:
webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
webservices/axis2/trunk/c/include/axis2_description_operation.h
webservices/axis2/trunk/c/include/axis2_description_param_include.h
webservices/axis2/trunk/c/include/axis2_description_parameter.h
webservices/axis2/trunk/c/include/axis2_description_service.h
webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
Modified: webservices/axis2/trunk/c/ides/anjuta/axis2c.prj
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/ides/anjuta/axis2c.prj?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/anjuta/axis2c.prj (original)
+++ webservices/axis2/trunk/c/ides/anjuta/axis2c.prj Tue Nov 1 03:08:52 2005
@@ -89,8 +89,6 @@
include/axis2_stream.h\
include/axis2_om_output.h\
modules/xml/guththila/src/guththila_xml_pull_parser.h\
- include/axis2_hash.h\
- include/axis2_string.h\
modules/util/test/util_error_test.h\
modules/util/test/util_hash_test.h\
modules/util/test/util_log_test.h\
@@ -115,12 +113,14 @@
include/axis2_core.h\
include/axis2_context_msg_context.h\
include/axis2_engine_msg_receiver.h\
- include/axis2_file_diff.h\
include/axis2_wsdl_operation.h\
include/axis2_wsdl_service.h\
modules/util/src/axis2_error_default.h\
modules/util/src/axis2_log_default.h\
- modules/util/src/axis2_stream_default.h
+ modules/util/src/axis2_stream_default.h\
+ modules/util/src/axis2_file_diff.h\
+ modules/util/src/axis2_hash.h\
+ modules/util/src/axis2_string.h
module.source.name=.
module.source.type=
@@ -171,7 +171,8 @@
modules/util/src/axis2_qname.c\
modules/util/src/axis2_file_diff.c\
modules/wsdl/src/axis2_wsdl_operation.c\
- modules/wsdl/src/axis2_wsdl_service.c
+ modules/wsdl/src/axis2_wsdl_service.c\
+ modules/wsdl/src/axis2_wsdl_component.c
module.pixmap.name=.
module.pixmap.type=
Modified: webservices/axis2/trunk/c/include/axis2_description_operation.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_operation.h?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_operation.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_operation.h Tue Nov 1 03:08:52 2005
@@ -47,104 +47,102 @@
/************************** Start of function macros **************************/
-#define axis2_description_operation_free(env, operation_desc) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->free (env, operation_desc));
-
-#define axis2_description_operation_add_param(env, operation_desc, param) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->add_param (env, operation_desc, param));
-
-#define axis2_description_operation_get_param get_param(env, operation_desc) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->get_param (env, operation_desc));
-
-#define axis2_description_operation_get_params get_params(env, operation_desc) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->get_params (env, operation_desc));
-
-#define axis2_description_operation_is_param_locked(env, operation_desc \
- , param_name) (axis2_description_operation_get_ops(env \
- ,operation_desc)->is_param_locked(env, operation_desc, param_name));
-
-#define axis2_description_operation_set_parent(env, operation_desc, \
- service_desc) (axis2_description_operation_get_ops(env, \
- operation_desc)->set_parent (env, operation_desc, service_desc));
-
-#define axis2_description_operation_get_parent(env, operation_desc) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->get_parent (env, operation_desc));
-
-#define axis2_description_operation_get_name(env, operation_desc) \
- (axis2_description_operation_get_ops(env, operation_desc)->get_name \
- (env, operation_desc));
-
-#define axis2_description_operation_set_msg_exchange_pattern(env, \
- operation_desc, msg_exchange_pattern) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->set_msg_exchange_pattern (env, \
- operation_desc, msg_exchange_pattern));
-
-#define axis2_description_operation_get_msg_exchange_pattern(env, operation_desc) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->get_msg_exchange_pattern (env, operation_desc));
-
-#define axis2_description_operation_set_msg_receiver(env, \
- operation_desc, msg_receiver) (axis2_description_operation_get_ops(env, \
- operation_desc)->set_msg_receiver (env, operation_desc, msg_receiver));
-
-#define axis2_description_operation_get_msg_receiver(env, operation_desc) \
- (axis2_description_operation_get_ops(env, \
- operation_desc)->get_msg_receiver (env, operation_desc));
+#define axis2_description_operation_free(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->free (operation_desc, env));
+
+#define axis2_description_operation_add_param(operation_desc, env, param) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->add_param (operation_desc, env, param));
+
+#define axis2_description_operation_get_param get_param(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->get_param (operation_desc, env));
+
+#define axis2_description_operation_get_params get_params(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->get_params (operation_desc, env));
+
+#define axis2_description_operation_is_param_locked(operation_desc, env \
+ , param_name) (axis2_description_operation_get_ops(operation_desc \
+ , env)->is_param_locked(operation_desc, env, param_name));
+
+#define axis2_description_operation_set_parent(operation_desc, env, \
+ service_desc) (axis2_description_operation_get_ops(operation_desc \
+ , env)->set_parent (operation_desc, env, service_desc));
+
+#define axis2_description_operation_get_parent(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->get_parent (operation_desc, env));
+
+#define axis2_description_operation_get_name(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc, env)->get_name \
+ (operation_desc, env));
+
+#define axis2_description_operation_set_msg_exchange_pattern(operation_desc \
+ , env, msg_exchange_pattern) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->set_msg_exchange_pattern (operation_desc \
+ , env, msg_exchange_pattern));
+
+#define axis2_description_operation_get_msg_exchange_pattern(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->get_msg_exchange_pattern (operation_desc, env));
+
+#define axis2_description_operation_set_msg_receiver(operation_desc \
+ , env, msg_receiver) (axis2_description_operation_get_ops(operation_desc \
+ , env)->set_msg_receiver (operation_desc, env, msg_receiver));
+
+#define axis2_description_operation_get_msg_receiver(operation_desc, env) \
+ (axis2_description_operation_get_ops(operation_desc \
+ , env)->get_msg_receiver (operation_desc, env));
/************************** End of function macros ****************************/
/************************** Start of function pointers ************************/
typedef axis2_status_t (*axis2_description_operation_free_t)
- (axis2_env_t * env,
- axis2_description_operation_t * operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
typedef axis2_status_t (*axis2_description_operation_add_param_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_param_t *param);
typedef axis2_description_param_t *(*axis2_description_operation_get_param_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *name);
typedef axis2_hash_t *(*axis2_description_operation_get_params_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
typedef axis2_bool_t (*axis2_description_operation_is_param_locked_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *param_name);
typedef axis2_status_t (*axis2_description_operation_set_parent_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_service_t *service_desc);
typedef axis2_description_service_t *(*axis2_description_operation_get_parent_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
typedef axis2_qname_t *(*axis2_description_operation_get_name_t)
- (axis2_env_t * env, axis2_description_operation_t * operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
typedef axis2_status_t (*axis2_description_operation_set_msg_exchange_pattern_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_char_t *pattern);
typedef axis2_char_t *(*axis2_description_operation_get_msg_exchange_pattern_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
typedef axis2_status_t (*axis2_description_operation_set_msg_receiver_t)
- (axis2_env_t * env,
- axis2_description_operation_t * operation_desc,
- axis2_engine_msg_receiver_t * msg_receiver);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env,
+ axis2_engine_msg_receiver_t *msg_receiver);
typedef axis2_engine_msg_receiver_t *(*axis2_description_operation_get_msg_receiver_t)
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
/**************************** End of function pointers ************************/
@@ -178,7 +176,7 @@
};
axis2_description_operation_ops_t *axis2_description_operation_get_ops
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
axis2_description_operation_t *axis2_description_operation_create
(axis2_env_t *env);
Modified: webservices/axis2/trunk/c/include/axis2_description_param_include.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_param_include.h?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_param_include.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_param_include.h Tue Nov 1 03:08:52 2005
@@ -54,25 +54,25 @@
/*************************** Function macros **********************************/
-#define axis2_description_param_include_free(env, param_include) \
- (axis2_description_param_include_get_ops(env, param_include)->free (env, \
+#define axis2_description_param_include_free(param_include, env) \
+ (axis2_description_param_include_get_ops(param_include, env)->free (env, \
param_include))
-#define axis2_description_param_include_add_param(env, param_include, \
- param) (axis2_description_param_include_get_ops(env, \
- param_include)->add_param (env, param_include, param))
-
-#define axis2_description_param_include_get_param(env, param_include) \
- (axis2_description_param_include_get_ops(env, \
- param_include)->get_param (env, param_include))
-
-#define axis2_description_param_include_get_params(env, param_include) \
- (axis2_description_param_include_get_ops(env, \
- param_include)->get_params (env, param_include))
-
-#define axis2_description_param_include_is_param_locked(env, \
- param_include, param_name) (axis2_description_param_include_get_ops(env, \
- param_include)->is_param_locked (env, param_include, param_name))
+#define axis2_description_param_include_add_param(param_include, env, \
+ param) (axis2_description_param_include_get_ops(param_include, \
+ env)->add_param (param_include, env, param))
+
+#define axis2_description_param_include_get_param(param_include, env) \
+ (axis2_description_param_include_get_ops(param_include, \
+ env)->get_param (param_include, env))
+
+#define axis2_description_param_include_get_params(param_include, env) \
+ (axis2_description_param_include_get_ops(param_include, \
+ env)->get_params (param_include, env))
+
+#define axis2_description_param_include_is_param_locked(param_include, env, \
+ param_name) (axis2_description_param_include_get_ops(param_include, \
+ env)->is_param_locked (param_include, env, param_name))
/*************************** End of function macros ***************************/
@@ -90,8 +90,7 @@
* @return status code
*/
typedef axis2_status_t (*axis2_description_param_include_add_param_t)
- (axis2_env_t * env,
- axis2_description_param_include_t * param_include,
+ (axis2_description_param_include_t *param_include, axis2_env_t *env,
const axis2_description_param_t * param);
/** To get a parameter in a given description
@@ -100,23 +99,21 @@
*/
typedef axis2_description_param_t
*(*axis2_description_param_include_get_param_t)
- (axis2_env_t *env, axis2_description_param_include_t *param_include,
+ (axis2_description_param_include_t *param_include, axis2_env_t *env,
const axis2_char_t *name);
/** To get all the parameters in a given description
* @return all the parameters contained
*/
typedef axis2_hash_t *(*axis2_description_param_include_get_params_t)
- (axis2_env_t * env,
- axis2_description_param_include_t * param_include);
+ (axis2_description_param_include_t *param_include, axis2_env_t *env);
/** To check whether the paramter is locked at any level
* @param parameter name
* @return whether parameter is locked
*/
typedef axis2_bool_t (*axis2_description_param_include_is_param_locked_t)
- (axis2_env_t *env,
- axis2_description_param_include_t *param_include,
+ (axis2_description_param_include_t *param_include, axis2_env_t *env,
const axis2_char_t *param_name);
/****************************** End of function pointers **********************/
@@ -143,8 +140,8 @@
* axis2_description_param_include_t struct
* @return operations for axis2_description_param_include_t
*/
-axis2_description_param_include_ops_t*axis2_description_param_include_get_ops
- (axis2_env_t *env, axis2_description_param_include_t *param_include);
+axis2_description_param_include_ops_t *axis2_description_param_include_get_ops
+ (axis2_description_param_include_t *param_include, axis2_env_t *env);
/**
* Create axis2_description_param_include_t
Modified: webservices/axis2/trunk/c/include/axis2_description_parameter.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_parameter.h?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_parameter.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_parameter.h Tue Nov 1 03:08:52 2005
@@ -45,29 +45,29 @@
/************************* Start of function macros ***************************/
-#define axis2_description_param_free(env, param) \
- (axis2_description_param_get_ops(env, param)->free (env, param))
+#define axis2_description_param_free(param, env) \
+ (axis2_description_param_get_ops(param, env)->free (param, env))
-#define axis2_description_param_set_name(env, param, name) \
- (axis2_description_param_get_ops(env, param)->set_name (env, param \
+#define axis2_description_param_set_name(param, env, name) \
+ (axis2_description_param_get_ops(param, env)->set_name (param, env \
, name))
-#define axis2_description_param_get_name(env, param) \
- (axis2_description_param_get_ops(env, param)->get_name (env, param))
+#define axis2_description_param_get_name(param, env) \
+ (axis2_description_param_get_ops(param, env)->get_name (param, env))
-#define axis2_description_param_set_value(env, param, value) \
- (axis2_description_param_get_ops(env, param)->set_value (env \
- , param, value))
-
-#define axis2_description_param_get_value(env, param) \
- (axis2_description_param_get_ops(env, param)->get_value (env, param))
-
-#define axis2_description_param_is_locked(env, param) \
- (axis2_description_param_get_ops(env, param)->is_locked (env, param))
-
-#define axis2_description_param_set_locked(env, param, locked) \
- (axis2_description_param_get_ops(env, param)->set_locked (env \
- , param, locked))
+#define axis2_description_param_set_value(param, env, value) \
+ (axis2_description_param_get_ops(param, env)->set_value (param \
+ , env, value))
+
+#define axis2_description_param_get_value(param, env) \
+ (axis2_description_param_get_ops(param, env)->get_value (param, env))
+
+#define axis2_description_param_is_locked(param, env) \
+ (axis2_description_param_get_ops(param, env)->is_locked (param, env))
+
+#define axis2_description_param_set_locked(param, env, locked) \
+ (axis2_description_param_get_ops(param, env)->set_locked (param \
+ , env, locked))
/*********************** End of function macros *******************************/
@@ -77,55 +77,55 @@
* memeory deallocation operation
* @return Status code
*/
- typedef axis2_status_t (*axis2_description_param_free_t)
- (axis2_env_t * env, axis2_description_param_t * param);
+typedef axis2_status_t (*axis2_description_param_free_t)
+ (axis2_description_param_t *param, axis2_env_t *env);
/**
* parameter name set operation
* @param parameter name
* @return Status code
*/
- typedef axis2_status_t (*axis2_description_param_set_name_t)
- (axis2_env_t * env, axis2_description_param_t * param,
- const axis2_char_t * name);
+typedef axis2_status_t (*axis2_description_param_set_name_t)
+ (axis2_description_param_t *param, axis2_env_t *env,
+ const axis2_char_t *name);
/**
* parameter name get operation
* @return parameter name
*/
- typedef axis2_char_t *(*axis2_description_param_get_name_t)
- (axis2_env_t * env, axis2_description_param_t * param);
+typedef axis2_char_t *(*axis2_description_param_get_name_t)
+ (axis2_description_param_t *param, axis2_env_t *env);
/**
* parameter value set operation
* @param parameter value
* @return Status code
*/
- typedef axis2_status_t (*axis2_description_param_set_value_t)
- (axis2_env_t * env, axis2_description_param_t * param,
+typedef axis2_status_t (*axis2_description_param_set_value_t)
+ (axis2_description_param_t *param, axis2_env_t *env,
void *value);
/**
* parameter value get operation
* @return parameter value
*/
- typedef void *(*axis2_description_param_get_value_t)
- (axis2_env_t * env, axis2_description_param_t * param);
+typedef void *(*axis2_description_param_get_value_t)
+ (axis2_description_param_t *param, axis2_env_t *env);
/**
* parameter lock check operation
* @return whether parameter is locked or not
*/
- typedef axis2_bool_t (*axis2_description_param_is_locked_t)
- (axis2_env_t * env, axis2_description_param_t * param);
+typedef axis2_bool_t (*axis2_description_param_is_locked_t)
+ (axis2_description_param_t *param, axis2_env_t *env);
/**
* parameter lock set operation
* @param lock boolean value
* @return Status code
*/
- typedef axis2_status_t (*axis2_description_param_set_locked_t)
- (axis2_env_t * env, axis2_description_param_t * param,
+typedef axis2_status_t (*axis2_description_param_set_locked_t)
+ (axis2_description_param_t *param, axis2_env_t *env,
const axis2_bool_t locked);
/**
@@ -139,7 +139,7 @@
* @return Status code
*/
/*typedef axis2_status_t (*axis2_description_param_set_param_element_t)
- (axis2_env_t *env, axis2_description_param_t *param
+ (axis2_description_param_t *param, *axis2_env_t *env
, axis2_om_element_t * om_element);
*/
@@ -147,28 +147,23 @@
* param element get operation
* @return parameter element
*/
- typedef axis2_description_param_t
- *
- (*axis2_description_param_get_param_element_t) (axis2_env_t *
- env,
- axis2_description_param_t
- * param);
+typedef axis2_description_param_t *(*axis2_description_param_get_param_element_t)
+ (axis2_description_param_t *param, axis2_env_t *env);
/**
* parameter type set operation
* @param parameter type
* @return Status code
*/
- typedef axis2_status_t (*axis2_description_param_set_type_t)
- (axis2_env_t * env, axis2_description_param_t * param,
- const int type);
+typedef axis2_status_t (*axis2_description_param_set_type_t)
+ (axis2_description_param_t *param, axis2_env_t *env, const int type);
/**
* parameter type get operation
* @return parameter type
*/
- typedef int (*axis2_description_param_get_type_t)
- (axis2_env_t * env, axis2_description_param_t * param);
+typedef int (*axis2_description_param_get_type_t)
+ (axis2_description_param_t *param, axis2_env_t *env);
/************************ End of function pointers ****************************/
@@ -205,14 +200,14 @@
* @return operations for axis2_description_param_t
*/
axis2_description_param_ops_t *axis2_description_param_get_ops
- (axis2_env_t * env, axis2_description_param_t * param);
+ (axis2_description_param_t *param, axis2_env_t *env);
/**
* Create axis2_description_param_t
* @return axis2_description_param_t
*/
axis2_description_param_t *axis2_description_param_create
- (axis2_env_t * env);
+ (axis2_env_t *env);
/**
* Create parameter with name and value
@@ -221,8 +216,8 @@
* @return axis2_description_param_t
*/
axis2_description_param_t *axis2_description_param_create_with_name_value
- (axis2_env_t * env, const axis2_char_t * name,
- const axis2_char_t * value);
+ (axis2_env_t *env, const axis2_char_t *name,
+ const axis2_char_t *value);
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_description_service.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_service.h?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_service.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_service.h Tue Nov 1 03:08:52 2005
@@ -48,57 +48,57 @@
/**************************** Start of function macros ************************/
-#define axis2_description_service_free(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->free \
- (env, service_desc));
+#define axis2_description_service_free(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->free \
+ (srv_desc, env));
-#define axis2_description_service_add_operation(env, service_desc, operation_desc) \
- (axis2_description_service_get_ops(env, service_desc)->add_operation \
- (env, service_desc, operation_desc));
+#define axis2_description_service_add_operation(srv_desc, env, operation_desc) \
+ (axis2_description_service_get_ops(srv_desc, env)->add_operation \
+ (srv_desc, env, operation_desc));
-#define axis2_description_service_get_operation_with_qname(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->get_operation_with_qname \
- (env, service_desc));
+#define axis2_description_service_get_operation_with_qname(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_operation_with_qname \
+ (srv_desc, env));
-#define axis2_description_service_get_operation_with_name(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->get_operation_with_name \
- (env, service_desc));
+#define axis2_description_service_get_operation_with_name(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_operation_with_name \
+ (srv_desc, env));
-#define axis2_description_service_get_operations(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->get_operations \
- (env, service_desc));
+#define axis2_description_service_get_operations(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_operations \
+ (srv_desc, env));
-#define axis2_description_service_set_parent(env, service_desc \
- , servicegroup_desc) (axis2_description_service_get_ops(env, \
- service_desc)->set_parent (env, service_desc, servicegroup_desc));
+#define axis2_description_service_set_parent(srv_desc, env \
+ , servicegroup_desc) (axis2_description_service_get_ops(service_desc \
+ , env)->set_parent (srv_desc, env, servicegroup_desc));
-#define axis2_description_service_get_parent(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->get_parent \
- (env, service_desc));
+#define axis2_description_service_get_parent(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_parent \
+ (srv_desc, env));
-#define axis2_description_service_get_name(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->get_name(env \
- ,service_desc));
+#define axis2_description_service_get_name(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_name(service_desc \
+ , env));
-#define axis2_description_service_add_param(env, service_desc, param) \
- (axis2_description_service_get_ops(env, service_desc)->add_param(env \
- , service_desc, param));
+#define axis2_description_service_add_param(srv_desc, env, param) \
+ (axis2_description_service_get_ops(srv_desc, env)->add_param(service_desc \
+ , env, param));
-#define axis2_description_service_get_param(env, service_desc, name) \
- (axis2_description_service_get_ops(env, service_desc)->get_param(env \
+#define axis2_description_service_get_param(srv_desc, env, name) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_param(env \
, service_desc, name));
-#define axis2_description_service_get_params(env, service_desc) \
- (axis2_description_service_get_ops(env, service_desc)->get_params(env \
+#define axis2_description_service_get_params(srv_desc, env) \
+ (axis2_description_service_get_ops(srv_desc, env)->get_params(env \
, service_desc));
-#define axis2_description_service_is_param_locked(env, service_desc, \
+#define axis2_description_service_is_param_locked(srv_desc, env, \
param_name) (axis2_description_service_get_ops(env \
- , service_desc)->is_parameter_locked(env, service_desc, param_name));
+ , service_desc)->is_parameter_locked(srv_desc, env, param_name));
/**************************** End of function macros **************************/
@@ -106,57 +106,49 @@
typedef axis2_status_t (*axis2_description_service_free_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
typedef axis2_status_t (*axis2_description_service_add_operation_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc,
+ (axis2_description_service_t *srv_desc, axis2_env_t *env,
axis2_description_operation_t * operation_desc);
typedef axis2_description_operation_t
*(*axis2_description_service_get_operation_with_qname_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc,
+ (axis2_description_service_t *srv_desc, axis2_env_t *env,
axis2_qname_t * operation_name);
typedef axis2_description_operation_t
* (*axis2_description_service_get_operation_with_name_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc,
+ (axis2_description_service_t *srv_desc, axis2_env_t *env,
const axis2_char_t * operation_name);
typedef axis2_hash_t *(*axis2_description_service_get_operations_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
typedef axis2_status_t (*axis2_description_service_set_parent_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc,
+ (axis2_description_service_t *srv_desc, axis2_env_t *env,
axis2_description_servicegroup_t * servicegroup_desc);
typedef axis2_description_servicegroup_t
* (*axis2_description_service_get_parent_t)
- (axis2_env_t * env,
- axis2_description_service_t * service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
typedef axis2_qname_t *(*axis2_description_service_get_name_t)
- (axis2_env_t *env, axis2_description_service_t *service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
typedef axis2_status_t (*axis2_description_service_add_param_t)
- (axis2_env_t *env
- , axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_description_param_t *param);
typedef axis2_description_param_t *(*axis2_description_service_get_param_t)
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *name);
typedef axis2_hash_t *(*axis2_description_service_get_params_t)
- (axis2_env_t *env, axis2_description_service_t *service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
typedef axis2_bool_t (*axis2_description_service_is_param_locked_t)
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *param_name);
/************************ End function pointers *******************************/
@@ -199,7 +191,7 @@
* @return operation struct for service
*/
axis2_description_service_ops_t *axis2_description_service_get_ops
- (axis2_env_t *env, axis2_description_service_t *service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
/** Create a service with qualified name
* @param qualified name
Modified: webservices/axis2/trunk/c/include/axis2_description_servicegroup.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_servicegroup.h?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_servicegroup.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_servicegroup.h Tue Nov 1 03:08:52 2005
@@ -46,48 +46,48 @@
/**************************** Start of function macros ************************/
-#define axis2_description_servicegroup_free(env, servicegroup_desc) \
- (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->free (env, servicegroup_desc));
+#define axis2_description_servicegroup_free(srvgrp_desc, env) \
+ (axis2_description_servicegroup_get_ops(srvgrp_desc, env)->free (srvgrp_desc \
+ , env));
-#define axis2_description_servicegroup_set_name(env, servicegroup_desc \
- , servicegroup_name) (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->set_name (env, servicegroup_desc, servicegroup_name));
+#define axis2_description_servicegroup_set_name(srvgrp_desc, env \
+ , servicegroup_name) (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->set_name (srvgrp_desc, env, servicegroup_name));
-#define axis2_description_servicegroup_get_name(env, servicegroup_desc) \
- (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->get_name(env, servicegroup_desc));
+#define axis2_description_servicegroup_get_name(srvgrp_desc, env) \
+ (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->get_name(srvgrp_desc, env));
-#define axis2_description_servicegroup_add_service(env, servicegroup_desc \
- , service_desc) (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->add_service (env, servicegroup_desc, service_desc));
+#define axis2_description_servicegroup_add_service(srvgrp_desc, env \
+ , service_desc) (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->add_service (srvgrp_desc, env, service_desc));
-#define axis2_description_servicegroup_get_service(env, servicegroup_desc \
- , service_desc) (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->get_service(env, servicegroup_desc, service_desc));
+#define axis2_description_servicegroup_get_service(srvgrp_desc, env \
+ , service_desc) (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->get_service(srvgrp_desc, env, service_desc));
-#define axis2_description_servicegroup_remove_service(env, servicegroup_desc \
- , service_name) (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->remove_service(env, servicegroup_desc, service_name));
+#define axis2_description_servicegroup_remove_service(srvgrp_desc, env) \
+ (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->remove_service(srvgrp_desc, env, service_name));
-#define axis2_description_servicegroup_add_param(env, servicegroup_desc, param) \
- (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->add_param(env, servicegroup_desc, param));
+#define axis2_description_servicegroup_add_param(srvgrp_desc, env, param) \
+ (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->add_param(srvgrp_desc, env, param));
-#define axis2_description_servicegroup_get_param(env, servicegroup_desc, name) \
- (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->get_param(env, servicegroup_desc, name));
+#define axis2_description_servicegroup_get_param(srvgrp_desc, env, name) \
+ (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->get_param(srvgrp_desc, env, name));
-#define axis2_description_servicegroup_get_params(env, servicegroup_desc) \
- (axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->get_params(env, servicegroup_desc));
+#define axis2_description_servicegroup_get_params(srvgrp_desc, env) \
+ (axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->get_params(srvgrp_desc, env));
-#define axis2_description_servicegroup_is_param_locked(env, servicegroup_desc \
- , param_name)(axis2_description_servicegroup_get_ops(env, \
- servicegroup_desc)->is_param_locked(env, servicegroup_desc, param_name));
+#define axis2_description_servicegroup_is_param_locked(srvgrp_desc, env \
+ , param_name)(axis2_description_servicegroup_get_ops(srvgrp_desc \
+ , env)->is_param_locked(srvgrp_desc, env, param_name));
/**************************** End of function macros **************************/
/**************************** Function pointers *******************************/
@@ -96,33 +96,29 @@
* @return status code
*/
typedef axis2_status_t (*axis2_description_servicegroup_free_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
/** Set name of the service group_member
* @param servicegroup_name
* @return status_code
*/
typedef axis2_status_t (*axis2_description_servicegroup_set_name_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_char_t *servicegroup_name);
/** get the service group name
* @return service group name
*/
typedef axis2_char_t *(*axis2_description_servicegroup_get_name_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
/** Add a service to the serivce group
* @param service to be added
* @return status code
*/
typedef axis2_status_t (*axis2_description_servicegroup_add_service_t)
- (axis2_env_t * env,
- axis2_description_servicegroup_t * servicegroup_desc,
- axis2_description_service_t * service_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
+ , axis2_description_service_t * service_desc);
/** Get the service from service group_member
* @param service_name
@@ -130,31 +126,27 @@
*/
typedef axis2_description_service_t
*(*axis2_description_servicegroup_get_service_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_qname_t* service_name);
typedef axis2_status_t (*axis2_description_servicegroup_remove_service_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_qname_t* service_name);
typedef axis2_status_t (*axis2_description_servicegroup_add_param_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_description_param_t *param);
typedef axis2_description_param_t *(*axis2_description_servicegroup_get_param_t)(
- axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
+ axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_char_t *name);
typedef axis2_hash_t *(*axis2_description_servicegroup_get_params_t)
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
typedef axis2_bool_t (*axis2_description_servicegroup_is_param_locked_t)
- (axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_char_t *param_name);
/*************************** End of function pointers *************************/
@@ -175,7 +167,7 @@
axis2_description_servicegroup_ops_t *axis2_description_servicegroup_get_ops
(axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+ , axis2_description_servicegroup_t *srvgrp_desc);
axis2_description_servicegroup_t *axis2_description_servicegroup_create
(axis2_env_t *env);
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c Tue Nov 1 03:08:52 2005
@@ -34,54 +34,52 @@
/*************************** Function headers *********************************/
-axis2_status_t axis2_description_operation_ops_free (axis2_env_t *env
- , axis2_description_operation_t *operation_desc);
+axis2_status_t axis2_description_operation_ops_free
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
axis2_status_t axis2_description_operation_ops_add_param
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_param_t *param);
axis2_description_param_t *axis2_description_operation_ops_get_param
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *name);
axis2_hash_t *axis2_description_operation_ops_get_params
- (axis2_env_t *env
- , axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
axis2_bool_t axis2_description_operation_ops_is_param_locked(
- axis2_env_t *env, axis2_description_operation_t *operation_desc
+ axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *param_name);
axis2_status_t axis2_description_operation_ops_set_parent
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_service_t *service_desc);
axis2_description_service_t *axis2_description_operation_ops_get_parent
- (axis2_env_t *env
- , axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
axis2_qname_t *axis2_description_operation_ops_get_name
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
axis2_status_t axis2_description_operation_ops_set_msg_exchange_pattern
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_char_t *pattern);
axis2_char_t *axis2_description_operation_ops_get_msg_exchange_pattern
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
axis2_status_t axis2_description_operation_ops_set_msg_receiver
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_engine_msg_receiver_t *msg_receiver);
axis2_engine_msg_receiver_t *axis2_description_operation_ops_get_msg_receiver
- (axis2_env_t *env, axis2_description_operation_t *operation_desc);
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env);
/************************* End of function headers ****************************/
axis2_description_operation_ops_t *axis2_description_operation_get_ops
- (axis2_env_t *env, axis2_description_operation_t *operation_desc)
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(!operation_desc)
{
@@ -170,8 +168,8 @@
/******************************************************************************/
-axis2_status_t axis2_description_operation_ops_free (axis2_env_t *env
- , axis2_description_operation_t *operation_desc)
+axis2_status_t axis2_description_operation_ops_free
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(operation_desc)
{
@@ -182,23 +180,23 @@
}
axis2_status_t axis2_description_operation_ops_add_param
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_param_t *param)
{
if(!operation_desc || !operation_desc->param_include || !param)
{
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- axis2_hash_set (axis2_description_param_include_get_params(env
- , operation_desc->param_include), axis2_description_param_get_name(env
- , param)
+ axis2_hash_set (axis2_description_param_include_get_params
+ (operation_desc->param_include, env), axis2_description_param_get_name
+ (param, env)
, AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
}
axis2_description_param_t *axis2_description_operation_ops_get_param(
- axis2_env_t *env, axis2_description_operation_t *operation_desc
+ axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *name)
{
if(!operation_desc || !operation_desc->param_include)
@@ -214,12 +212,12 @@
}
return (axis2_description_param_t *)(axis2_hash_get
- (axis2_description_param_include_get_params(env
- , operation_desc->param_include), tempname, AXIS2_HASH_KEY_STRING));
+ (axis2_description_param_include_get_params(operation_desc->param_include
+ , env), tempname, AXIS2_HASH_KEY_STRING));
}
axis2_hash_t *axis2_description_operation_ops_get_params(
- axis2_env_t *env, axis2_description_operation_t *operation_desc)
+ axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(!operation_desc || !operation_desc->param_include)
{
@@ -227,12 +225,12 @@
return NULL;
}
- return axis2_description_param_include_get_params(env
- , operation_desc->param_include);
+ return axis2_description_param_include_get_params(operation_desc->param_include
+ , env);
}
axis2_bool_t axis2_description_operation_ops_is_param_locked(
- axis2_env_t *env, axis2_description_operation_t *operation_desc
+ axis2_description_operation_t *operation_desc, axis2_env_t *env
, const axis2_char_t *param_name)
{
if(!env || !operation_desc || !operation_desc->param_include)
@@ -247,13 +245,13 @@
return AXIS2_FALSE;
}
- return axis2_description_param_include_is_param_locked (env
- , operation_desc->param_include, param_name);
+ return axis2_description_param_include_is_param_locked
+ (operation_desc->param_include, env, param_name);
}
axis2_status_t axis2_description_operation_ops_set_parent
- (axis2_env_t *env ,axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_description_service_t *service_desc)
{
if(!operation_desc || !service_desc)
@@ -265,8 +263,7 @@
}
axis2_description_service_t *axis2_description_operation_ops_get_parent
- (axis2_env_t *env
- , axis2_description_operation_t *operation_desc)
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(!operation_desc)
{
@@ -277,7 +274,7 @@
}
axis2_qname_t *axis2_description_operation_ops_get_name
- (axis2_env_t *env, axis2_description_operation_t *operation_desc)
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(!operation_desc)
{
@@ -288,7 +285,7 @@
}
axis2_status_t axis2_description_operation_ops_set_msg_exchange_pattern
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_char_t *pattern)
{
if(!operation_desc)
@@ -302,7 +299,7 @@
}
axis2_char_t *axis2_description_operation_ops_get_msg_exchange_pattern
- (axis2_env_t *env, axis2_description_operation_t *operation_desc)
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(!operation_desc)
{
@@ -313,7 +310,7 @@
}
axis2_status_t axis2_description_operation_ops_set_msg_receiver
- (axis2_env_t *env, axis2_description_operation_t *operation_desc
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env
, axis2_engine_msg_receiver_t *msg_receiver)
{
if(!operation_desc)
@@ -327,7 +324,7 @@
}
axis2_engine_msg_receiver_t *axis2_description_operation_ops_get_msg_receiver
- (axis2_env_t *env, axis2_description_operation_t *operation_desc)
+ (axis2_description_operation_t *operation_desc, axis2_env_t *env)
{
if(!operation_desc)
{
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c Tue Nov 1 03:08:52 2005
@@ -34,27 +34,24 @@
(axis2_description_param_include_t *param_include);
axis2_status_t axis2_description_param_include_ops_add_param
- (axis2_env_t *environment
- , axis2_description_param_include_t *param_include
+ (axis2_description_param_include_t *param_include, axis2_env_t *env
, const axis2_description_param_t *param);
axis2_description_param_t *axis2_description_param_include_ops_get_param
- (axis2_env_t *env, axis2_description_param_include_t *param_include
+ (axis2_description_param_include_t *param_include, axis2_env_t *env
, const axis2_char_t *name);
axis2_hash_t *axis2_description_param_include_ops_get_params
- (axis2_env_t *env
- , axis2_description_param_include_t *param_include);
+ (axis2_description_param_include_t *param_include, axis2_env_t *env);
axis2_status_t axis2_description_param_include_ops_is_param_locked
- (axis2_env_t *env, axis2_description_param_include_t *param_include
+ (axis2_description_param_include_t *param_include, axis2_env_t *env
, const axis2_char_t *param_name);
/************************** End of function prototypes ************************/
axis2_description_param_include_ops_t *axis2_description_param_include_get_ops
- (axis2_env_t *env
- , axis2_description_param_include_t *param_include)
+ (axis2_description_param_include_t *param_include, axis2_env_t *env)
{
if(!param_include)
{
@@ -115,8 +112,7 @@
}
axis2_status_t axis2_description_param_include_ops_add_param
- (axis2_env_t *env
- , axis2_description_param_include_t *param_include
+ (axis2_description_param_include_t *param_include, axis2_env_t *env
, const axis2_description_param_t *param)
{
if(!param_include || !param)
@@ -128,7 +124,7 @@
param_include->params = axis2_hash_make (env);
}
axis2_hash_set (param_include->params
- , axis2_description_param_get_name(env, param)
+ , axis2_description_param_get_name(param, env)
, AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
@@ -136,8 +132,7 @@
}
axis2_description_param_t *axis2_description_param_include_ops_get_param
- (axis2_env_t* env
- , axis2_description_param_include_t *param_include
+ (axis2_description_param_include_t *param_include, axis2_env_t *env
, const axis2_char_t *name)
{
if(!param_include)
@@ -151,8 +146,7 @@
}
axis2_hash_t *axis2_description_param_include_ops_get_params
- (axis2_env_t *env
- , axis2_description_param_include_t *param_include)
+ (axis2_description_param_include_t *param_include, axis2_env_t *env)
{
if(!param_include)
{
@@ -163,8 +157,7 @@
}
axis2_status_t axis2_description_param_include_ops_is_param_locked
- (axis2_env_t *env
- , axis2_description_param_include_t *param_include
+ (axis2_description_param_include_t *param_include, axis2_env_t *env
, const axis2_char_t *param_name)
{
axis2_description_param_t *param = (axis2_description_param_t *)
@@ -174,5 +167,5 @@
if(!param)
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- return axis2_description_param_is_locked(env, param);
+ return axis2_description_param_is_locked(param, env);
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c Tue Nov 1 03:08:52 2005
@@ -34,44 +34,44 @@
/***************************** Function prototypes ****************************/
-axis2_status_t axis2_description_param_ops_free (axis2_env_t *env
- , axis2_description_param_t * param);
+axis2_status_t axis2_description_param_ops_free (
+ axis2_description_param_t *param, axis2_env_t *env);
-axis2_status_t axis2_description_param_ops_set_name (axis2_env_t *env
- , axis2_description_param_t * param, const axis2_char_t *name);
+axis2_status_t axis2_description_param_ops_set_name (
+ axis2_description_param_t *param, axis2_env_t *env, const axis2_char_t *name);
-axis2_char_t *axis2_description_param_ops_get_name (axis2_env_t *env
- , axis2_description_param_t * param);
+axis2_char_t *axis2_description_param_ops_get_name (
+ axis2_description_param_t *param, axis2_env_t *env);
-axis2_status_t axis2_description_param_ops_set_value (axis2_env_t *env
- , axis2_description_param_t * param, void *value);
+axis2_status_t axis2_description_param_ops_set_value (
+ axis2_description_param_t *param, axis2_env_t *env, void *value);
-void *axis2_description_param_ops_get_value (axis2_env_t *env
- , axis2_description_param_t * param);
+void *axis2_description_param_ops_get_value (
+ axis2_description_param_t *param, axis2_env_t *env);
-axis2_bool_t axis2_description_param_ops_is_locked (axis2_env_t *env
- , axis2_description_param_t * param);
+axis2_bool_t axis2_description_param_ops_is_locked (
+ axis2_description_param_t *param, axis2_env_t *env);
-axis2_status_t axis2_description_param_ops_set_locked (axis2_env_t *env
- , axis2_description_param_t * param, const axis2_bool_t locked);
+axis2_status_t axis2_description_param_ops_set_locked (
+ axis2_description_param_t *param, axis2_env_t *env, const axis2_bool_t locked);
-/*void axis2_description_param_ops_set_param_element (axis2_env_t *env
- , axis2_description_param_t * param, const axis2_om_element_t * om_element);
+/*void axis2_description_param_ops_set_param_element (
+ axis2_description_param_t *param, axis2_env_t *env, const axis2_om_element_t * om_element);
*/
/*axis2_description_param_t *axis2_description_param_ops_get_param_element
- (axis2_env_t *env, axis2_description_param_t *param);*/
+ (axis2_description_param_t *param, axis2_env_t *env);*/
-axis2_status_t axis2_description_param_ops_set_type (axis2_env_t *env
- , axis2_description_param_t * param, const int type);
+axis2_status_t axis2_description_param_ops_set_type (
+ axis2_description_param_t *param, axis2_env_t *env, const int type);
-int axis2_description_param_ops_get_type (axis2_env_t *env
- , axis2_description_param_t * param);
+int axis2_description_param_ops_get_type (
+ axis2_description_param_t *param, axis2_env_t *env);
/************************** End of function prototypes ************************/
axis2_description_param_ops_t *axis2_description_param_get_ops
- (axis2_env_t *env, axis2_description_param_t *param)
+ (axis2_description_param_t *param, axis2_env_t *env)
{
if(!param)
{
@@ -160,8 +160,8 @@
/**********************Start of operation impls********************************/
-axis2_status_t axis2_description_param_ops_free (axis2_env_t *env
- ,axis2_description_param_t * param)
+axis2_status_t axis2_description_param_ops_free (axis2_description_param_t *param,
+ axis2_env_t *env)
{
if(param)
{
@@ -171,8 +171,9 @@
return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED;
}
-axis2_status_t axis2_description_param_ops_set_name (axis2_env_t *env
- , axis2_description_param_t * param, const axis2_char_t *name)
+axis2_status_t axis2_description_param_ops_set_name
+ (axis2_description_param_t *param, axis2_env_t *env
+ , const axis2_char_t *name)
{
if(!param)
{
@@ -183,8 +184,8 @@
return AXIS2_SUCCESS;
}
-axis2_char_t *axis2_description_param_ops_get_name (axis2_env_t *env
- , axis2_description_param_t *param)
+axis2_char_t *axis2_description_param_ops_get_name
+ (axis2_description_param_t *param, axis2_env_t *env)
{
if(!param)
{
@@ -195,8 +196,8 @@
return param->name;
}
-axis2_status_t axis2_description_param_ops_set_value (axis2_env_t *env
- , axis2_description_param_t * param, void *value)
+axis2_status_t axis2_description_param_ops_set_value
+ (axis2_description_param_t *param, axis2_env_t *env, void *value)
{
if(!param)
{
@@ -206,8 +207,8 @@
return AXIS2_SUCCESS;
}
-void *axis2_description_param_ops_get_value (axis2_env_t *env
- , axis2_description_param_t * param)
+void *axis2_description_param_ops_get_value
+ (axis2_description_param_t *param, axis2_env_t *env)
{
if(!param)
{
@@ -218,8 +219,8 @@
return param->value;
}
-axis2_bool_t axis2_description_param_ops_is_locked (axis2_env_t *env
- , axis2_description_param_t * param)
+axis2_bool_t axis2_description_param_ops_is_locked
+ (axis2_description_param_t *param, axis2_env_t *env)
{
if(!param)
{
@@ -229,8 +230,8 @@
return param->is_locked;
}
-axis2_status_t axis2_description_param_ops_set_locked (axis2_env_t *env
- , axis2_description_param_t * param, const axis2_bool_t is_locked)
+axis2_status_t axis2_description_param_ops_set_locked
+ (axis2_description_param_t *param, axis2_env_t *env, const axis2_bool_t is_locked)
{
if(!param)
{
@@ -241,7 +242,7 @@
}
/*axis2_status_t axis2_description_param_ops_set_param_element
- (axis2_env_t *env, axis2_description_param_t * param
+ (axis2_description_param_t *param, axis2_env_t *env
, const axis2_om_element_t * om_element)
{
if(!param)
@@ -254,7 +255,7 @@
}
axis2_description_param_t *axis2_description_param_get_param_element
- (axis2_env_t *env, axis2_description_param_t *param)
+ (axis2_description_param_t *param, axis2_env_t *env)
{
if(!param)
{
@@ -264,8 +265,8 @@
return (axis2_description_param_t *) param->param_element;
}*/
-axis2_status_t axis2_description_param_ops_set_type (axis2_env_t *env
- , axis2_description_param_t * param, const int type)
+axis2_status_t axis2_description_param_ops_set_type
+ (axis2_description_param_t *param, axis2_env_t *env, const int type)
{
if(!param)
{
@@ -275,8 +276,8 @@
return AXIS2_SUCCESS;
}
-int axis2_description_param_ops_get_type (axis2_env_t *env
- , axis2_description_param_t * param)
+int axis2_description_param_ops_get_type (
+ axis2_description_param_t *param, axis2_env_t *env)
{
if(!param)
{
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c Tue Nov 1 03:08:52 2005
@@ -17,70 +17,70 @@
/*************************** Function headers ********************************/
-axis2_status_t axis2_description_service_ops_free (axis2_env_t *env
- , axis2_description_service_t *service_desc);
+axis2_status_t axis2_description_service_ops_free
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
axis2_status_t axis2_description_service_ops_add_operation
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_description_operation_t *operation_desc);
axis2_description_operation_t *
axis2_description_service_ops_get_operation_with_qname(
- axis2_env_t *env, axis2_description_service_t *service_desc
+ axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_qname_t *operation_name);
axis2_description_operation_t *
axis2_description_service_ops_get_operation_with_name
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t* operation_name);
axis2_hash_t *axis2_description_service_ops_get_operations(
- axis2_env_t *env, axis2_description_service_t *service_desc);
+ axis2_description_service_t *srv_desc, axis2_env_t *env);
-axis2_status_t axis2_description_service_ops_set_parent(axis2_env_t *env
- , axis2_description_service_t *service_desc
+axis2_status_t axis2_description_service_ops_set_parent
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
,axis2_description_servicegroup_t *servicegroup_desc);
axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
- (axis2_env_t *env, axis2_description_service_t *service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
axis2_qname_t *axis2_description_service_ops_get_name
- (axis2_env_t *env, axis2_description_service_t *service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
-axis2_status_t axis2_description_service_ops_add_param(axis2_env_t *env
- , axis2_description_service_t *service_desc
+axis2_status_t axis2_description_service_ops_add_param
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_description_param_t *param);
axis2_description_param_t *axis2_description_service_ops_get_param
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *name);
axis2_hash_t *axis2_description_service_ops_get_params
- (axis2_env_t *env, axis2_description_service_t *service_desc);
+ (axis2_description_service_t *srv_desc, axis2_env_t *env);
axis2_bool_t axis2_description_service_ops_is_param_locked(
- axis2_env_t *env, axis2_description_service_t *service_desc
+ axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *param_name);
/************************* End of function headers ***************************/
axis2_description_service_ops_t * axis2_description_service_get_ops
- (axis2_env_t *env, axis2_description_service_t *service_desc)
+ (axis2_description_service_t *srv_desc, axis2_env_t *env)
{
- if(!service_desc)
+ if(NULL == srv_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return service_desc->ops;
+ return srv_desc->ops;
}
axis2_description_service_t *axis2_description_service_create
(axis2_env_t *env)
{
- axis2_description_service_t *service_desc = (axis2_description_service_t *)
+ axis2_description_service_t *srv_desc = (axis2_description_service_t *)
AXIS2_MALLOC (env->allocator, sizeof(axis2_description_service_t));
- if(!service_desc)
+ if(!srv_desc)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
return NULL;
@@ -105,7 +105,7 @@
ops->set_parent = axis2_description_service_ops_set_parent;
ops->get_parent = axis2_description_service_ops_get_parent;
- service_desc->ops = ops;
+ srv_desc->ops = ops;
axis2_description_param_include_t *param_include
= (axis2_description_param_include_t *)
@@ -116,46 +116,46 @@
return NULL;
}
- service_desc->param_include = param_include;
+ srv_desc->param_include = param_include;
- service_desc->parent = NULL;
+ srv_desc->parent = NULL;
- service_desc->wasaction_opeartionmap = axis2_hash_make (env);
- if(!service_desc->wasaction_opeartionmap)
+ srv_desc->wasaction_opeartionmap = axis2_hash_make (env);
+ if(!srv_desc->wasaction_opeartionmap)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
- service_desc->name = NULL;
+ srv_desc->name = NULL;
- return service_desc;
+ return srv_desc;
}
axis2_description_service_t *axis2_description_service_create_with_qname
(axis2_env_t *env, axis2_qname_t *qname)
{
- axis2_description_service_t *service_desc =
+ axis2_description_service_t *srv_desc =
axis2_description_service_create(env);
- if(!service_desc)
+ if(!srv_desc)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
- service_desc->name = axis2_strdup(qname);
+ srv_desc->name = axis2_strdup(qname);
- return service_desc;
+ return srv_desc;
}
/********************** Start of function implementations ********************/
axis2_status_t axis2_description_service_ops_free
- (axis2_env_t *env, axis2_description_service_t *service_desc)
+ (axis2_description_service_t *srv_desc, axis2_env_t *env)
{
if(!env)
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- if(service_desc)
+ if(srv_desc)
{
- AXIS2_FREE(env->allocator, service_desc);
+ AXIS2_FREE(env->allocator, srv_desc);
return AXIS2_SUCCESS;
}
return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED;
@@ -163,23 +163,23 @@
axis2_status_t axis2_description_service_ops_add_operation
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_description_operation_t *operation_desc)
{
- if(!service_desc || !operation_desc)
+ if(!srv_desc || !operation_desc)
{
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- if (!(service_desc->wasaction_opeartionmap))
+ if (!(srv_desc->wasaction_opeartionmap))
{
- service_desc->wasaction_opeartionmap = axis2_hash_make (env);
+ srv_desc->wasaction_opeartionmap = axis2_hash_make (env);
}
axis2_description_operation_ops_t *tempopt =
- (axis2_description_operation_get_ops(env, operation_desc));
+ (axis2_description_operation_get_ops(operation_desc, env));
if(!tempopt) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- axis2_qname_t *tempqname = tempopt->get_name(env, operation_desc);
+ axis2_qname_t *tempqname = tempopt->get_name(operation_desc, env);
if(!tempqname) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
@@ -187,7 +187,7 @@
if(!tempname) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- axis2_hash_set (service_desc->wasaction_opeartionmap
+ axis2_hash_set (srv_desc->wasaction_opeartionmap
, tempname
, AXIS2_HASH_KEY_STRING, operation_desc);
@@ -196,100 +196,100 @@
axis2_description_operation_t
*axis2_description_service_ops_get_operation_with_qname
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_qname_t *operation_name)
{
- if(!service_desc || !service_desc->wasaction_opeartionmap)
+ if(!srv_desc || !srv_desc->wasaction_opeartionmap)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
return (axis2_description_operation_t *) (axis2_hash_get
- (service_desc->wasaction_opeartionmap, operation_name->localpart
+ (srv_desc->wasaction_opeartionmap, operation_name->localpart
, AXIS2_HASH_KEY_STRING));
}
axis2_description_operation_t
*axis2_description_service_ops_get_operation_with_name
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t* name)
{
- if(!service_desc || !service_desc->wasaction_opeartionmap)
+ if(!srv_desc || !srv_desc->wasaction_opeartionmap)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
return (axis2_description_operation_t *) (axis2_hash_get
- (service_desc->wasaction_opeartionmap
+ (srv_desc->wasaction_opeartionmap
, axis2_strdup(name), AXIS2_HASH_KEY_STRING));
}
axis2_hash_t *axis2_description_service_ops_get_operations
- (axis2_env_t *env, axis2_description_service_t *service_desc)
+ (axis2_description_service_t *srv_desc, axis2_env_t *env)
{
- if(!service_desc)
+ if(!srv_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return service_desc->wasaction_opeartionmap;
+ return srv_desc->wasaction_opeartionmap;
}
axis2_status_t axis2_description_service_ops_set_parent
- (axis2_env_t *env, axis2_description_service_t *service_desc
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
,axis2_description_servicegroup_t *servicegroup_desc)
{
- if(!service_desc || !servicegroup_desc)
+ if(!srv_desc || !servicegroup_desc)
{
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- service_desc->parent = servicegroup_desc;
+ srv_desc->parent = servicegroup_desc;
return AXIS2_SUCCESS;
}
axis2_description_servicegroup_t *axis2_description_service_ops_get_parent
- (axis2_env_t *env, axis2_description_service_t *service_desc)
+ (axis2_description_service_t *srv_desc, axis2_env_t *env)
{
- if(!service_desc || !service_desc->parent)
+ if(!srv_desc || !srv_desc->parent)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return service_desc->parent;
+ return srv_desc->parent;
}
axis2_qname_t *axis2_description_service_ops_get_name
- (axis2_env_t *env, axis2_description_service_t *service_desc)
+ (axis2_description_service_t *srv_desc, axis2_env_t *env)
{
- if(!env || !service_desc)
+ if(!env || !srv_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return service_desc->name;
+ return srv_desc->name;
}
-axis2_status_t axis2_description_service_ops_add_param(axis2_env_t *env
- , axis2_description_service_t *service_desc
+axis2_status_t axis2_description_service_ops_add_param
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, axis2_description_param_t *param)
{
- if(!env || !service_desc || !service_desc->param_include || !param)
+ if(!env || !srv_desc || !srv_desc->param_include || !param)
{
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- axis2_hash_set (axis2_description_param_include_get_params(env
- , service_desc->param_include), axis2_description_param_get_name(env
- , param)
+ axis2_hash_set (axis2_description_param_include_get_params
+ (srv_desc->param_include, env), axis2_description_param_get_name(param
+ , env)
, AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
}
axis2_description_param_t *axis2_description_service_ops_get_param(
- axis2_env_t *env, axis2_description_service_t *service_desc
+ axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *name)
{
- if(!env || !service_desc || !service_desc->param_include)
+ if(!env || !srv_desc || !srv_desc->param_include)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
@@ -302,29 +302,28 @@
}
return (axis2_description_param_t *)(axis2_hash_get
- (axis2_description_param_include_get_params(env
- , service_desc->param_include), tempname, AXIS2_HASH_KEY_STRING));
+ (axis2_description_param_include_get_params(srv_desc->param_include, env)
+ , tempname, AXIS2_HASH_KEY_STRING));
}
axis2_hash_t *axis2_description_service_ops_get_params
- (axis2_env_t *env, axis2_description_service_t *service_desc)
+ (axis2_description_service_t *srv_desc, axis2_env_t *env)
{
- if(!env || !service_desc)
+ if(!env || !srv_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return axis2_description_param_include_get_params(env
- , service_desc->param_include);
+ return axis2_description_param_include_get_params(srv_desc->param_include, env);
}
-axis2_bool_t axis2_description_service_ops_is_param_locked(
- axis2_env_t *env, axis2_description_service_t *service_desc
+axis2_bool_t axis2_description_service_ops_is_param_locked
+ (axis2_description_service_t *srv_desc, axis2_env_t *env
, const axis2_char_t *param_name)
{
- if(!env || !service_desc || !service_desc->param_include)
+ if(!env || !srv_desc || !srv_desc->param_include)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FALSE;
@@ -336,7 +335,7 @@
return AXIS2_FALSE;
}
- return axis2_description_param_include_is_param_locked (env
- , service_desc->param_include, param_name);
+ return axis2_description_param_include_is_param_locked
+ (srv_desc->param_include, env, param_name);
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c?rev=330024&r1=330023&r2=330024&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c Tue Nov 1 03:08:52 2005
@@ -31,72 +31,66 @@
/***************************** Function headers *******************************/
-axis2_status_t axis2_description_servicegroup_ops_free(axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+axis2_status_t axis2_description_servicegroup_ops_free
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
axis2_status_t axis2_description_servicegroup_ops_set_name
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_char_t *name);
axis2_char_t *axis2_description_servicegroup_ops_get_name
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env);
axis2_status_t axis2_description_servicegroup_ops_add_service
- (axis2_env_t *env
- , axis2_description_servicegroup_t* servicegroup_desc
+ (axis2_description_servicegroup_t* srvgrp_desc, axis2_env_t *env
, axis2_description_service_t *service_desc);
axis2_description_service_t *axis2_description_servicegroup_ops_get_service
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_qname_t* service_name);
axis2_status_t axis2_description_servicegroup_ops_remove_service
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_qname_t* service_name);
axis2_status_t axis2_description_servicegroup_ops_add_param
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_description_param_t *param);
axis2_description_param_t *axis2_description_servicegroup_ops_get_param(
- axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
+ axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_char_t *name);
axis2_hash_t *axis2_description_servicegroup_ops_get_params
(axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc);
+ , axis2_description_servicegroup_t *srvgrp_desc);
axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
- axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
+ axis2_description_servicegroup_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_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc)
+ , axis2_description_servicegroup_t *srvgrp_desc)
{
- if(!env || !servicegroup_desc)
+ if(!env || !srvgrp_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return servicegroup_desc->ops;
+ return srvgrp_desc->ops;
}
axis2_description_servicegroup_t *axis2_description_servicegroup_create
(axis2_env_t *env)
{
- axis2_description_servicegroup_t *servicegroup_desc
+ axis2_description_servicegroup_t *srvgrp_desc
= (axis2_description_servicegroup_t *)
AXIS2_MALLOC (env->allocator, sizeof(axis2_description_servicegroup_t));
- if(!servicegroup_desc)
+ if(!srvgrp_desc)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
return NULL;
@@ -115,7 +109,7 @@
ops->add_service = axis2_description_servicegroup_ops_add_service;
ops->get_service = axis2_description_servicegroup_ops_get_service;
- servicegroup_desc->ops = ops;
+ srvgrp_desc->ops = ops;
axis2_description_param_include_t *param_include
= (axis2_description_param_include_t *)
@@ -126,122 +120,116 @@
return NULL;
}
- servicegroup_desc->param_include = param_include;
+ srvgrp_desc->param_include = param_include;
- /*servicegroup_desc->parent = NULL;*/
+ /*srvgrp_desc->parent = NULL;*/
- servicegroup_desc->services = axis2_hash_make (env);
- if(!servicegroup_desc->services)
+ srvgrp_desc->services = axis2_hash_make (env);
+ if(!srvgrp_desc->services)
{
env->error->error_number = AXIS2_ERROR_NO_MEMORY;
return NULL;
}
- servicegroup_desc->servicegroup_name = NULL;
+ srvgrp_desc->servicegroup_name = NULL;
- return servicegroup_desc;
+ return srvgrp_desc;
}
/******************************************************************************/
-axis2_status_t axis2_description_servicegroup_ops_free(axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc)
+axis2_status_t axis2_description_servicegroup_ops_free
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env)
{
- if(!env || !servicegroup_desc)
+ if(!env || !srvgrp_desc)
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- AXIS2_FREE(env->allocator, servicegroup_desc);
+ AXIS2_FREE(env->allocator, srvgrp_desc);
return AXIS2_SUCCESS;
}
axis2_status_t axis2_description_servicegroup_ops_set_name
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_char_t *name)
{
- if(!env || !servicegroup_desc)
+ if(!env || !srvgrp_desc)
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
axis2_char_t *tempname = axis2_strdup(name);
if(!tempname) return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- servicegroup_desc->servicegroup_name = name;
+ srvgrp_desc->servicegroup_name = name;
return AXIS2_SUCCESS;
}
axis2_char_t *axis2_description_servicegroup_ops_get_name
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc)
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env)
{
- if(!env || !servicegroup_desc)
+ if(!env || !srvgrp_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return servicegroup_desc->servicegroup_name;
+ return srvgrp_desc->servicegroup_name;
}
axis2_status_t axis2_description_servicegroup_ops_add_service
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_description_service_t *service_desc)
{
- if(!env || servicegroup_desc || service_desc)
+ if(!env || srvgrp_desc || service_desc)
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
- axis2_qname_t *tempname = axis2_description_service_get_name(env, service_desc);
- axis2_hash_set (servicegroup_desc->services, tempname->localpart
+ axis2_qname_t *tempname = axis2_description_service_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_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_qname_t* service_name)
{
- if(!env || !servicegroup_desc || ! service_name)
+ if(!env || !srvgrp_desc || ! service_name)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
return (axis2_description_service_t *) (axis2_hash_get
- (servicegroup_desc->services, service_name->localpart
+ (srvgrp_desc->services, service_name->localpart
, AXIS2_HASH_KEY_STRING));
}
axis2_status_t axis2_description_servicegroup_ops_remove_service
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_qname_t* service_name)
{
- if(!env || !servicegroup_desc || ! service_name)
+ if(!env || !srvgrp_desc || ! service_name)
{
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- axis2_hash_set (servicegroup_desc->services, service_name->localpart
+ axis2_hash_set (srvgrp_desc->services, service_name->localpart
, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_SUCCESS;
}
axis2_status_t axis2_description_servicegroup_ops_add_param
- (axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc
+ (axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, axis2_description_param_t *param)
{
- if(!env || !servicegroup_desc || !servicegroup_desc->param_include || !param)
+ if(!env || !srvgrp_desc || !srvgrp_desc->param_include || !param)
{
return AXIS2_ERROR_INVALID_NULL_PARAMETER;
}
- axis2_hash_set (axis2_description_param_include_get_params(env
- , servicegroup_desc->param_include), axis2_description_param_get_name(env
- , param)
+ axis2_hash_set (axis2_description_param_include_get_params
+ (srvgrp_desc->param_include, env), axis2_description_param_get_name
+ (param, env)
, AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
}
axis2_description_param_t *axis2_description_servicegroup_ops_get_param(
- axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
+ axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_char_t *name)
{
- if(!env || !servicegroup_desc || !servicegroup_desc->param_include)
+ if(!env || !srvgrp_desc || !srvgrp_desc->param_include)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
@@ -254,30 +242,30 @@
}
return (axis2_description_param_t *)(axis2_hash_get
- (axis2_description_param_include_get_params(env
- , servicegroup_desc->param_include), tempname, AXIS2_HASH_KEY_STRING));
+ (axis2_description_param_include_get_params
+ (srvgrp_desc->param_include, env), tempname, AXIS2_HASH_KEY_STRING));
}
axis2_hash_t *axis2_description_servicegroup_ops_get_params
(axis2_env_t *env
- , axis2_description_servicegroup_t *servicegroup_desc)
+ , axis2_description_servicegroup_t *srvgrp_desc)
{
- if(!env || !servicegroup_desc)
+ if(!env || !srvgrp_desc)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return NULL;
}
- return axis2_description_param_include_get_params(env
- , servicegroup_desc->param_include);
+ return axis2_description_param_include_get_params(srvgrp_desc->param_include
+ , env);
}
axis2_bool_t axis2_description_servicegroup_ops_is_param_locked(
- axis2_env_t *env, axis2_description_servicegroup_t *servicegroup_desc
+ axis2_description_servicegroup_t *srvgrp_desc, axis2_env_t *env
, const axis2_char_t *param_name)
{
- if(!env || !servicegroup_desc || !servicegroup_desc->param_include)
+ if(!env || !srvgrp_desc || !srvgrp_desc->param_include)
{
env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER;
return AXIS2_FALSE;
@@ -289,7 +277,7 @@
return AXIS2_FALSE;
}
- return axis2_description_param_include_is_param_locked (env
- , servicegroup_desc->param_include, param_name);
+ return axis2_description_param_include_is_param_locked
+ (srvgrp_desc->param_include, env, param_name);
}