You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2006/08/08 13:17:08 UTC
svn commit: r429631 - in /webservices/axis2/trunk/c: include/axis2_op_ctx.h
modules/core/context/op_ctx.c
Author: pini
Date: Tue Aug 8 04:17:07 2006
New Revision: 429631
URL: http://svn.apache.org/viewvc?rev=429631&view=rev
Log:
More formatting fixes and parameter changes to const.
Modified:
webservices/axis2/trunk/c/include/axis2_op_ctx.h
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
Modified: webservices/axis2/trunk/c/include/axis2_op_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op_ctx.h?rev=429631&r1=429630&r2=429631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op_ctx.h Tue Aug 8 04:17:07 2006
@@ -56,34 +56,34 @@
struct axis2_svc_ctx;
/**
- * @brief Message Context ops struct
+ * Message Context ops struct
* Encapsulator struct for ops of axis2_op_ctx
*/
struct axis2_op_ctx_ops
{
- /**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
- */
- axis2_ctx_t* (AXIS2_CALL *
+ /**
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
+ */
+ axis2_ctx_t *(AXIS2_CALL *
get_base)(
- struct axis2_op_ctx *op_ctx,
+ const axis2_op_ctx_t *op_ctx,
const axis2_env_t *env);
- /**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
- */
+ /**
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
+ */
axis2_status_t (AXIS2_CALL *
free)(
- struct axis2_op_ctx *op_ctx,
+ struct axis2_op_ctx *op_ctx,
const axis2_env_t *env);
/**
* The method is used to do the intialization of the axis2_op_ctx
- * @param op_ctx pointer to operation context
- * @param env pointer to enviornment struct
- * @param conf pointer to conf
+ * @param op_ctx pointer to operation context
+ * @param env pointer to enviornment struct
+ * @param conf pointer to conf
*/
axis2_status_t (AXIS2_CALL *
init)(
@@ -92,49 +92,48 @@
struct axis2_conf *conf);
/**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
* @return Returns the op.
*/
- struct axis2_op* (AXIS2_CALL *
+ struct axis2_op *(AXIS2_CALL *
get_op)(
- struct axis2_op_ctx *op_ctx,
+ const axis2_op_ctx_t *op_ctx,
const axis2_env_t *env);
/**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
* @return Return the struct axis2_svc_ctx * in which this op_ctx lives.
*/
- struct axis2_svc_ctx* (AXIS2_CALL *
+ struct axis2_svc_ctx *(AXIS2_CALL *
get_parent)(
- struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env);
/**
* When a new message is added to the <code>MEPContext</code> the logic
* should be included remove the MEPContext from the table in the
* <code>axis2_conf_ctx</code>. Example: IN_IN_OUT At the second IN
* message the MEPContext should be removed from the AxisOperation
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
- * @param msg_ctx pointer to message context
- *
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
+ * @param msg_ctx pointer to message context
*/
axis2_status_t (AXIS2_CALL *
add_msg_ctx)(
- struct axis2_op_ctx *op_ctx,
+ struct axis2_op_ctx *op_ctx,
const axis2_env_t *env,
axis2_msg_ctx_t *msg_ctx);
/**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
- * @param message_id ponter to message id
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
+ * @param message_id ponter to message id
*/
- axis2_msg_ctx_t* (AXIS2_CALL *
+ axis2_msg_ctx_t *(AXIS2_CALL *
get_msg_ctx)(
- struct axis2_op_ctx *op_ctx,
+ const axis2_op_ctx_t *op_ctx,
const axis2_env_t *env,
const axis2_char_t *message_id);
@@ -142,21 +141,21 @@
* Checks to see if the MEP is complete. i.e. whether all the messages that
* are associated with the MEP has arrived and MEP is complete.
* @param op_ctx pointer to operation context
- * @param env pointer to environment struct
+ * @param env pointer to environment struct
*/
axis2_bool_t (AXIS2_CALL *
get_is_complete)(
- struct axis2_op_ctx *op_ctx,
+ const axis2_op_ctx_t *op_ctx,
const axis2_env_t *env);
- /**
- * @param op_ctx pointer to operatoin context
- * @param env pointer to environment struct
- * @param is_complete is_complete
- */
+ /**
+ * @param op_ctx pointer to operatoin context
+ * @param env pointer to environment struct
+ * @param is_complete is_complete
+ */
axis2_status_t (AXIS2_CALL *
set_complete)(
- struct axis2_op_ctx *op_ctx,
+ struct axis2_op_ctx *op_ctx,
const axis2_env_t *env,
axis2_bool_t is_complete);
@@ -169,32 +168,32 @@
* he should call is_complete() first. However, in cases like IN_OPTIONAL_OUT
* and OUT_OPTIONAL_IN, it is possibe this will get called without the MEP
* being complete due to the optional nature of the MEP.
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
*/
axis2_status_t (AXIS2_CALL *
cleanup)(
- struct axis2_op_ctx *op_ctx,
+ struct axis2_op_ctx *op_ctx,
const axis2_env_t *env);
- /**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
- * @param svc_ctx pointer to service context
- */
+ /**
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
+ * @param svc_ctx pointer to service context
+ */
axis2_status_t (AXIS2_CALL *
set_parent)(
- struct axis2_op_ctx *op_ctx,
+ struct axis2_op_ctx *op_ctx,
const axis2_env_t *env,
struct axis2_svc_ctx *svc_ctx);
- /**
- * @param op_ctx pointer to operation context
- * @param env pointer to environment struct
- */
- axis2_hash_t* (AXIS2_CALL *
+ /**
+ * @param op_ctx pointer to operation context
+ * @param env pointer to environment struct
+ */
+ axis2_hash_t *(AXIS2_CALL *
get_msg_ctx_map)(
- struct axis2_op_ctx *op_ctx,
+ const axis2_op_ctx_t *op_ctx,
const axis2_env_t *env);
};
@@ -204,7 +203,7 @@
*/
struct axis2_op_ctx
{
- /** operatoins of operation context struct */
+ /** operatoins of operation context struct */
axis2_op_ctx_ops_t *ops;
};
@@ -214,11 +213,11 @@
* @param op pointer to operation
* @param svc_ctx pointer to service context
*/
- AXIS2_EXTERN axis2_op_ctx_t* AXIS2_CALL
+ AXIS2_EXTERN axis2_op_ctx_t *AXIS2_CALL
axis2_op_ctx_create(
const axis2_env_t *env,
- struct axis2_op *op,
- struct axis2_svc_ctx * svc_ctx);
+ struct axis2_op *op,
+ struct axis2_svc_ctx *svc_ctx);
/************************** Start of function macros **************************/
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?rev=429631&r1=429630&r2=429631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Tue Aug 8 04:17:07 2006
@@ -48,79 +48,91 @@
axis2_qname_t *svc_qname;
/* Mutex to syncronize the read/write operations */
axis2_thread_mutex_t *mutex;
-} axis2_op_ctx_impl_t;
+}
+axis2_op_ctx_impl_t;
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(op_ctx) ((axis2_op_ctx_impl_t *)op_ctx)
-axis2_ctx_t* AXIS2_CALL
-axis2_op_ctx_get_base(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+axis2_ctx_t *AXIS2_CALL
+axis2_op_ctx_get_base(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_op_ctx_free (struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+axis2_op_ctx_free(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_op_ctx_init(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
+axis2_op_ctx_init(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
struct axis2_conf *conf);
-axis2_op_t* AXIS2_CALL
-axis2_op_ctx_getAxisOperation(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+axis2_op_t *AXIS2_CALL
+axis2_op_ctx_getAxisOperation(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env);
-struct axis2_svc_ctx * AXIS2_CALL
-axis2_op_ctx_get_parent(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+struct axis2_svc_ctx *AXIS2_CALL
+axis2_op_ctx_get_parent(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_op_ctx_add_msg_ctx(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+axis2_op_ctx_add_msg_ctx(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
-axis2_msg_ctx_t* AXIS2_CALL
-axis2_op_ctx_get_msg_ctx(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- const axis2_char_t *messageLabel);
+axis2_msg_ctx_t *AXIS2_CALL
+axis2_op_ctx_get_msg_ctx(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *messageLabel);
axis2_bool_t AXIS2_CALL
-axis2_op_ctx_get_is_complete(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+axis2_op_ctx_get_is_complete(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_op_ctx_set_complete(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- axis2_bool_t is_complete);
+axis2_op_ctx_set_complete(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ axis2_bool_t is_complete);
axis2_status_t AXIS2_CALL
-axis2_op_ctx_cleanup(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+axis2_op_ctx_cleanup(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_op_ctx_set_parent(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- struct axis2_svc_ctx* svc_ctx);
-
-
-axis2_op_t* AXIS2_CALL
-axis2_op_ctx_get_op(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
+axis2_op_ctx_set_parent(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ struct axis2_svc_ctx *svc_ctx);
+
+axis2_op_t *AXIS2_CALL
+axis2_op_ctx_get_op(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env);
-axis2_hash_t* AXIS2_CALL
-axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env);
-
-
-
-AXIS2_EXTERN axis2_op_ctx_t* AXIS2_CALL
-axis2_op_ctx_create(const axis2_env_t *env,
- axis2_op_t *op,
- struct axis2_svc_ctx* svc_ctx)
+axis2_hash_t *AXIS2_CALL
+axis2_op_ctx_get_msg_ctx_map(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env);
+
+AXIS2_EXTERN axis2_op_ctx_t *AXIS2_CALL
+axis2_op_ctx_create(
+ const axis2_env_t *env,
+ axis2_op_t *op,
+ struct axis2_svc_ctx *svc_ctx)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
@@ -229,9 +241,10 @@
return &(op_ctx_impl->op_ctx);
}
-axis2_ctx_t* AXIS2_CALL
-axis2_op_ctx_get_base(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+axis2_ctx_t *AXIS2_CALL
+axis2_op_ctx_get_base(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(op_ctx)->base;
@@ -239,8 +252,9 @@
axis2_status_t AXIS2_CALL
-axis2_op_ctx_free (struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+axis2_op_ctx_free(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
@@ -281,9 +295,10 @@
* The method is used to do the intialization of the axis2_op_ctx
*/
axis2_status_t AXIS2_CALL
-axis2_op_ctx_init(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- struct axis2_conf *conf)
+axis2_op_ctx_init(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ struct axis2_conf *conf)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
axis2_hash_index_t *hi = NULL;
@@ -332,9 +347,10 @@
/**
* @return Returns the op.
*/
-axis2_op_t* AXIS2_CALL
-axis2_op_ctx_get_op(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+axis2_op_t *AXIS2_CALL
+axis2_op_ctx_get_op(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(op_ctx)->op;
@@ -342,12 +358,12 @@
/**
* Return the struct axis2_svc_ctx * in which this op_ctx lives.
- *
* @return parent struct axis2_svc_ctx *
*/
-struct axis2_svc_ctx * AXIS2_CALL
-axis2_op_ctx_get_parent(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+struct axis2_svc_ctx *AXIS2_CALL
+axis2_op_ctx_get_parent(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(op_ctx)->parent;
@@ -358,13 +374,13 @@
* should be included remove the MEPContext from the table in the
* <code>axis2_conf_ctx</code>. Example: IN_IN_OUT At the second IN
* message the MEPContext should be removed from the AxisOperation
- *
* @param msgContext
*/
axis2_status_t AXIS2_CALL
-axis2_op_ctx_add_msg_ctx(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+axis2_op_ctx_add_msg_ctx(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ axis2_msg_ctx_t *msg_ctx)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
@@ -389,13 +405,13 @@
/**
* @param messageLabel
* @return
- * @
*/
-axis2_msg_ctx_t* AXIS2_CALL
-axis2_op_ctx_get_msg_ctx(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- const axis2_char_t *message_id)
+axis2_msg_ctx_t *AXIS2_CALL
+axis2_op_ctx_get_msg_ctx(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env,
+ const axis2_char_t *message_id)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
@@ -419,20 +435,21 @@
/**
* Checks to see if the MEP is complete. i.e. whether all the messages that
* are associated with the MEP has arrived and MEP is complete.
- *
*/
axis2_bool_t AXIS2_CALL
-axis2_op_ctx_get_is_complete(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+axis2_op_ctx_get_is_complete(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(op_ctx)->is_complete;
}
axis2_status_t AXIS2_CALL
-axis2_op_ctx_set_complete(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- axis2_bool_t is_complete)
+axis2_op_ctx_set_complete(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ axis2_bool_t is_complete)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(op_ctx)->is_complete = is_complete;
@@ -450,8 +467,9 @@
* being complete due to the optional nature of the MEP.
*/
axis2_status_t AXIS2_CALL
-axis2_op_ctx_cleanup(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+axis2_op_ctx_cleanup(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
axis2_hash_index_t *hi = NULL;
@@ -485,9 +503,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_op_ctx_set_parent(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env,
- struct axis2_svc_ctx* svc_ctx)
+axis2_op_ctx_set_parent(
+ struct axis2_op_ctx *op_ctx,
+ const axis2_env_t *env,
+ struct axis2_svc_ctx *svc_ctx)
{
axis2_op_ctx_impl_t *op_ctx_impl = NULL;
@@ -516,9 +535,10 @@
return AXIS2_SUCCESS;
}
-axis2_hash_t* AXIS2_CALL
-axis2_op_ctx_get_msg_ctx_map(struct axis2_op_ctx *op_ctx,
- const axis2_env_t *env)
+axis2_hash_t *AXIS2_CALL
+axis2_op_ctx_get_msg_ctx_map(
+ const axis2_op_ctx_t *op_ctx,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(op_ctx)->msg_ctx_map;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org